X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FShardTest.java;h=7d4c054b3e9a4e86728feb9e5936ae9550cee888;hp=243b2cb7e20fb81ecf16161743e9bfe460137b00;hb=2fd1fa721510a30f58b3bc277deb05fce58badd6;hpb=6276a65120a674b545ea787a5e1d9311bcdbf2af diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTest.java index 243b2cb7e2..7d4c054b3e 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.controller.cluster.datastore; import static org.junit.Assert.assertEquals; @@ -14,11 +13,12 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; import static org.opendaylight.controller.cluster.datastore.DataStoreVersions.CURRENT_VERSION; + import akka.actor.ActorRef; import akka.actor.ActorSelection; import akka.actor.Props; @@ -31,12 +31,13 @@ import akka.persistence.SaveSnapshotSuccess; import akka.testkit.TestActorRef; import akka.util.Timeout; import com.google.common.base.Stopwatch; -import com.google.common.primitives.UnsignedLong; +import com.google.common.base.Throwables; import com.google.common.util.concurrent.Uninterruptibles; -import java.io.IOException; +import java.time.Duration; import java.util.Collections; import java.util.HashSet; import java.util.Map; +import java.util.Optional; import java.util.Set; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -58,38 +59,31 @@ import org.opendaylight.controller.cluster.datastore.messages.BatchedModificatio import org.opendaylight.controller.cluster.datastore.messages.BatchedModificationsReply; import org.opendaylight.controller.cluster.datastore.messages.CanCommitTransaction; import org.opendaylight.controller.cluster.datastore.messages.CanCommitTransactionReply; +import org.opendaylight.controller.cluster.datastore.messages.CloseDataTreeNotificationListenerRegistration; +import org.opendaylight.controller.cluster.datastore.messages.CloseDataTreeNotificationListenerRegistrationReply; import org.opendaylight.controller.cluster.datastore.messages.CommitTransaction; import org.opendaylight.controller.cluster.datastore.messages.CommitTransactionReply; import org.opendaylight.controller.cluster.datastore.messages.CreateTransaction; import org.opendaylight.controller.cluster.datastore.messages.CreateTransactionReply; -import org.opendaylight.controller.cluster.datastore.messages.ForwardedReadyTransaction; import org.opendaylight.controller.cluster.datastore.messages.PeerAddressResolved; import org.opendaylight.controller.cluster.datastore.messages.ReadData; import org.opendaylight.controller.cluster.datastore.messages.ReadDataReply; import org.opendaylight.controller.cluster.datastore.messages.ReadyLocalTransaction; import org.opendaylight.controller.cluster.datastore.messages.ReadyTransactionReply; -import org.opendaylight.controller.cluster.datastore.messages.RegisterChangeListener; -import org.opendaylight.controller.cluster.datastore.messages.RegisterChangeListenerReply; import org.opendaylight.controller.cluster.datastore.messages.RegisterDataTreeChangeListener; -import org.opendaylight.controller.cluster.datastore.messages.RegisterDataTreeChangeListenerReply; +import org.opendaylight.controller.cluster.datastore.messages.RegisterDataTreeNotificationListenerReply; import org.opendaylight.controller.cluster.datastore.messages.ShardLeaderStateChanged; import org.opendaylight.controller.cluster.datastore.messages.UpdateSchemaContext; import org.opendaylight.controller.cluster.datastore.modification.MergeModification; -import org.opendaylight.controller.cluster.datastore.modification.MutableCompositeModification; import org.opendaylight.controller.cluster.datastore.modification.WriteModification; import org.opendaylight.controller.cluster.datastore.persisted.MetadataShardDataTreeSnapshot; -import org.opendaylight.controller.cluster.datastore.persisted.ShardDataTreeSnapshot; -import org.opendaylight.controller.cluster.datastore.utils.MockDataChangeListener; +import org.opendaylight.controller.cluster.datastore.persisted.ShardSnapshotState; import org.opendaylight.controller.cluster.datastore.utils.MockDataTreeChangeListener; import org.opendaylight.controller.cluster.notifications.RegisterRoleChangeListener; import org.opendaylight.controller.cluster.notifications.RegisterRoleChangeListenerReply; import org.opendaylight.controller.cluster.raft.RaftActorContext; import org.opendaylight.controller.cluster.raft.ReplicatedLogEntry; -import org.opendaylight.controller.cluster.raft.ReplicatedLogImplEntry; -import org.opendaylight.controller.cluster.raft.Snapshot; -import org.opendaylight.controller.cluster.raft.base.messages.ApplyJournalEntries; import org.opendaylight.controller.cluster.raft.base.messages.ApplySnapshot; -import org.opendaylight.controller.cluster.raft.base.messages.ApplyState; import org.opendaylight.controller.cluster.raft.base.messages.ElectionTimeout; import org.opendaylight.controller.cluster.raft.base.messages.FollowerInitialSyncUpStatus; import org.opendaylight.controller.cluster.raft.base.messages.TimeoutNow; @@ -99,24 +93,25 @@ import org.opendaylight.controller.cluster.raft.client.messages.GetOnDemandRaftS import org.opendaylight.controller.cluster.raft.client.messages.OnDemandRaftState; import org.opendaylight.controller.cluster.raft.messages.RequestVote; import org.opendaylight.controller.cluster.raft.messages.ServerRemoved; +import org.opendaylight.controller.cluster.raft.persisted.ApplyJournalEntries; +import org.opendaylight.controller.cluster.raft.persisted.SimpleReplicatedLogEntry; +import org.opendaylight.controller.cluster.raft.persisted.Snapshot; import org.opendaylight.controller.cluster.raft.policy.DisableElectionsRaftPolicy; import org.opendaylight.controller.cluster.raft.protobuff.client.messages.Payload; import org.opendaylight.controller.cluster.raft.utils.InMemoryJournal; import org.opendaylight.controller.cluster.raft.utils.MessageCollectorActor; import org.opendaylight.controller.md.cluster.datastore.model.SchemaContextHelper; import org.opendaylight.controller.md.cluster.datastore.model.TestModel; -import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker; -import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException; +import org.opendaylight.yangtools.concepts.Identifier; 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.MapNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTree; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate; +import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeConfiguration; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataValidationFailedException; -import org.opendaylight.yangtools.yang.data.api.schema.tree.TipProducingDataTree; -import org.opendaylight.yangtools.yang.data.api.schema.tree.TreeType; 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.data.impl.schema.tree.InMemoryDataTreeFactory; @@ -125,302 +120,169 @@ import scala.concurrent.Future; import scala.concurrent.duration.FiniteDuration; public class ShardTest extends AbstractShardTest { - private static final String DUMMY_DATA = "Dummy data as snapshot sequence number is set to 0 in InMemorySnapshotStore and journal recovery seq number will start from 1"; - - @Test - public void testRegisterChangeListener() throws Exception { - new ShardTestKit(getSystem()) {{ - final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), "testRegisterChangeListener"); - - waitUntilLeader(shard); - - shard.tell(new UpdateSchemaContext(SchemaContextHelper.full()), ActorRef.noSender()); - - final MockDataChangeListener listener = new MockDataChangeListener(1); - final ActorRef dclActor = actorFactory.createActor(DataChangeListener.props(listener), - "testRegisterChangeListener-DataChangeListener"); - - shard.tell(new RegisterChangeListener(TestModel.TEST_PATH, - dclActor, AsyncDataBroker.DataChangeScope.BASE, true), getRef()); - - final RegisterChangeListenerReply reply = expectMsgClass(duration("3 seconds"), - RegisterChangeListenerReply.class); - final String replyPath = reply.getListenerRegistrationPath().toString(); - assertTrue("Incorrect reply path: " + replyPath, replyPath.matches( - "akka:\\/\\/test\\/user\\/testRegisterChangeListener\\/\\$.*")); - - final YangInstanceIdentifier path = TestModel.TEST_PATH; - writeToStore(shard, path, ImmutableNodes.containerNode(TestModel.TEST_QNAME)); - - listener.waitForChangeEvents(path); - }}; - } - - @SuppressWarnings("serial") - @Test - public void testChangeListenerNotifiedWhenNotTheLeaderOnRegistration() throws Exception { - // This test tests the timing window in which a change listener is registered before the - // shard becomes the leader. We verify that the listener is registered and notified of the - // existing data when the shard becomes the leader. - new ShardTestKit(getSystem()) {{ - // For this test, we want to send the RegisterChangeListener message after the shard - // has recovered from persistence and before it becomes the leader. So we subclass - // Shard to override onReceiveCommand and, when the first ElectionTimeout is received, - // we know that the shard has been initialized to a follower and has started the - // election process. The following 2 CountDownLatches are used to coordinate the - // ElectionTimeout with the sending of the RegisterChangeListener message. - final CountDownLatch onFirstElectionTimeout = new CountDownLatch(1); - final CountDownLatch onChangeListenerRegistered = new CountDownLatch(1); - final Creator creator = new Creator() { - boolean firstElectionTimeout = true; - - @Override - public Shard create() throws Exception { - // Use a non persistent provider because this test actually invokes persist on the journal - // this will cause all other messages to not be queued properly after that. - // The basic issue is that you cannot use TestActorRef with a persistent actor (at least when - // it does do a persist) - return new Shard(newShardBuilder()) { - @Override - public void handleCommand(final Object message) { - if(message instanceof ElectionTimeout && firstElectionTimeout) { - // Got the first ElectionTimeout. We don't forward it to the - // base Shard yet until we've sent the RegisterChangeListener - // message. So we signal the onFirstElectionTimeout latch to tell - // the main thread to send the RegisterChangeListener message and - // start a thread to wait on the onChangeListenerRegistered latch, - // which the main thread signals after it has sent the message. - // After the onChangeListenerRegistered is triggered, we send the - // original ElectionTimeout message to proceed with the election. - firstElectionTimeout = false; - final ActorRef self = getSelf(); - new Thread() { - @Override - public void run() { - Uninterruptibles.awaitUninterruptibly( - onChangeListenerRegistered, 5, TimeUnit.SECONDS); - self.tell(message, self); - } - }.start(); - - onFirstElectionTimeout.countDown(); - } else { - super.handleCommand(message); - } - } - }; - } - }; - - setupInMemorySnapshotStore(); - - final MockDataChangeListener listener = new MockDataChangeListener(1); - final ActorRef dclActor = actorFactory.createActor(DataChangeListener.props(listener), - "testRegisterChangeListenerWhenNotLeaderInitially-DataChangeListener"); - - final TestActorRef shard = actorFactory.createTestActor( - Props.create(new DelegatingShardCreator(creator)).withDispatcher(Dispatchers.DefaultDispatcherId()), - "testRegisterChangeListenerWhenNotLeaderInitially"); - - final YangInstanceIdentifier path = TestModel.TEST_PATH; - - // Wait until the shard receives the first ElectionTimeout message. - assertEquals("Got first ElectionTimeout", true, - onFirstElectionTimeout.await(5, TimeUnit.SECONDS)); - - // Now send the RegisterChangeListener and wait for the reply. - shard.tell(new RegisterChangeListener(path, dclActor, - AsyncDataBroker.DataChangeScope.SUBTREE, false), getRef()); - - final RegisterChangeListenerReply reply = expectMsgClass(duration("5 seconds"), - RegisterChangeListenerReply.class); - assertNotNull("getListenerRegistrationPath", reply.getListenerRegistrationPath()); - - // Sanity check - verify the shard is not the leader yet. - shard.tell(FindLeader.INSTANCE, getRef()); - final FindLeaderReply findLeadeReply = - expectMsgClass(duration("5 seconds"), FindLeaderReply.class); - assertFalse("Expected the shard not to be the leader", findLeadeReply.getLeaderActor().isPresent()); - - // Signal the onChangeListenerRegistered latch to tell the thread above to proceed - // with the election process. - onChangeListenerRegistered.countDown(); - - // Wait for the shard to become the leader and notify our listener with the existing - // data in the store. - listener.waitForChangeEvents(path); - }}; - } + private static final String DUMMY_DATA = "Dummy data as snapshot sequence number is set to 0 in " + + "InMemorySnapshotStore and journal recovery seq number will start from 1"; @Test public void testRegisterDataTreeChangeListener() throws Exception { - new ShardTestKit(getSystem()) {{ - final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), "testRegisterDataTreeChangeListener"); + final ShardTestKit testKit = new ShardTestKit(getSystem()); + final TestActorRef shard = actorFactory.createTestActor( + newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), + "testRegisterDataTreeChangeListener"); - waitUntilLeader(shard); + ShardTestKit.waitUntilLeader(shard); - shard.tell(new UpdateSchemaContext(SchemaContextHelper.full()), ActorRef.noSender()); + shard.tell(new UpdateSchemaContext(SchemaContextHelper.full()), ActorRef.noSender()); - final MockDataTreeChangeListener listener = new MockDataTreeChangeListener(1); - final ActorRef dclActor = actorFactory.createActor(DataTreeChangeListenerActor.props(listener), - "testRegisterDataTreeChangeListener-DataTreeChangeListener"); + final MockDataTreeChangeListener listener = new MockDataTreeChangeListener(1); + final ActorRef dclActor = actorFactory.createActor(DataTreeChangeListenerActor.props(listener, + TestModel.TEST_PATH), "testRegisterDataTreeChangeListener-DataTreeChangeListener"); - shard.tell(new RegisterDataTreeChangeListener(TestModel.TEST_PATH, dclActor, false), getRef()); + shard.tell(new RegisterDataTreeChangeListener(TestModel.TEST_PATH, dclActor, false), testKit.getRef()); - final RegisterDataTreeChangeListenerReply reply = expectMsgClass(duration("3 seconds"), - RegisterDataTreeChangeListenerReply.class); - final String replyPath = reply.getListenerRegistrationPath().toString(); - assertTrue("Incorrect reply path: " + replyPath, replyPath.matches( - "akka:\\/\\/test\\/user\\/testRegisterDataTreeChangeListener\\/\\$.*")); + final RegisterDataTreeNotificationListenerReply reply = testKit.expectMsgClass(Duration.ofSeconds(3), + RegisterDataTreeNotificationListenerReply.class); + final String replyPath = reply.getListenerRegistrationPath().toString(); + assertTrue("Incorrect reply path: " + replyPath, + replyPath.matches("akka:\\/\\/test\\/user\\/testRegisterDataTreeChangeListener\\/\\$.*")); - final YangInstanceIdentifier path = TestModel.TEST_PATH; - writeToStore(shard, path, ImmutableNodes.containerNode(TestModel.TEST_QNAME)); + final YangInstanceIdentifier path = TestModel.TEST_PATH; + writeToStore(shard, path, ImmutableNodes.containerNode(TestModel.TEST_QNAME)); - listener.waitForChangeEvents(); - }}; + listener.waitForChangeEvents(); } @SuppressWarnings("serial") @Test public void testDataTreeChangeListenerNotifiedWhenNotTheLeaderOnRegistration() throws Exception { - new ShardTestKit(getSystem()) {{ - final CountDownLatch onFirstElectionTimeout = new CountDownLatch(1); - final CountDownLatch onChangeListenerRegistered = new CountDownLatch(1); - final Creator creator = new Creator() { - boolean firstElectionTimeout = true; - - @Override - public Shard create() throws Exception { - return new Shard(newShardBuilder()) { - @Override - public void handleCommand(final Object message) { - if(message instanceof ElectionTimeout && firstElectionTimeout) { - firstElectionTimeout = false; - final ActorRef self = getSelf(); - new Thread() { - @Override - public void run() { - Uninterruptibles.awaitUninterruptibly( - onChangeListenerRegistered, 5, TimeUnit.SECONDS); - self.tell(message, self); - } - }.start(); - - onFirstElectionTimeout.countDown(); - } else { - super.handleCommand(message); - } - } - }; - } - }; + final CountDownLatch onFirstElectionTimeout = new CountDownLatch(1); + final CountDownLatch onChangeListenerRegistered = new CountDownLatch(1); + final Creator creator = new Creator() { + boolean firstElectionTimeout = true; - setupInMemorySnapshotStore(); - - final MockDataTreeChangeListener listener = new MockDataTreeChangeListener(1); - final ActorRef dclActor = actorFactory.createActor(DataTreeChangeListenerActor.props(listener), - "testDataTreeChangeListenerNotifiedWhenNotTheLeaderOnRegistration-DataChangeListener"); + @Override + public Shard create() { + return new Shard(newShardBuilder()) { + @Override + public void handleCommand(final Object message) { + if (message instanceof ElectionTimeout && firstElectionTimeout) { + firstElectionTimeout = false; + final ActorRef self = getSelf(); + new Thread(() -> { + Uninterruptibles.awaitUninterruptibly( + onChangeListenerRegistered, 5, TimeUnit.SECONDS); + self.tell(message, self); + }).start(); + + onFirstElectionTimeout.countDown(); + } else { + super.handleCommand(message); + } + } + }; + } + }; - final TestActorRef shard = actorFactory.createTestActor( - Props.create(new DelegatingShardCreator(creator)).withDispatcher(Dispatchers.DefaultDispatcherId()), - "testDataTreeChangeListenerNotifiedWhenNotTheLeaderOnRegistration"); + setupInMemorySnapshotStore(); - final YangInstanceIdentifier path = TestModel.TEST_PATH; + final YangInstanceIdentifier path = TestModel.TEST_PATH; + final MockDataTreeChangeListener listener = new MockDataTreeChangeListener(1); + final ActorRef dclActor = actorFactory.createActor(DataTreeChangeListenerActor.props(listener, path), + "testDataTreeChangeListenerNotifiedWhenNotTheLeaderOnRegistration-DataChangeListener"); - assertEquals("Got first ElectionTimeout", true, - onFirstElectionTimeout.await(5, TimeUnit.SECONDS)); + final TestActorRef shard = actorFactory.createTestActor( + Props.create(new DelegatingShardCreator(creator)).withDispatcher(Dispatchers.DefaultDispatcherId()), + "testDataTreeChangeListenerNotifiedWhenNotTheLeaderOnRegistration"); - shard.tell(new RegisterDataTreeChangeListener(path, dclActor, false), getRef()); - final RegisterDataTreeChangeListenerReply reply = expectMsgClass(duration("5 seconds"), - RegisterDataTreeChangeListenerReply.class); - assertNotNull("getListenerRegistratioznPath", reply.getListenerRegistrationPath()); + final ShardTestKit testKit = new ShardTestKit(getSystem()); + assertTrue("Got first ElectionTimeout", onFirstElectionTimeout.await(5, TimeUnit.SECONDS)); - shard.tell(FindLeader.INSTANCE, getRef()); - final FindLeaderReply findLeadeReply = - expectMsgClass(duration("5 seconds"), FindLeaderReply.class); - assertFalse("Expected the shard not to be the leader", findLeadeReply.getLeaderActor().isPresent()); + shard.tell(new RegisterDataTreeChangeListener(path, dclActor, false), testKit.getRef()); + final RegisterDataTreeNotificationListenerReply reply = testKit.expectMsgClass(Duration.ofSeconds(5), + RegisterDataTreeNotificationListenerReply.class); + assertNotNull("getListenerRegistratioznPath", reply.getListenerRegistrationPath()); + shard.tell(FindLeader.INSTANCE, testKit.getRef()); + final FindLeaderReply findLeadeReply = testKit.expectMsgClass(Duration.ofSeconds(5), FindLeaderReply.class); + assertFalse("Expected the shard not to be the leader", findLeadeReply.getLeaderActor().isPresent()); - onChangeListenerRegistered.countDown(); + onChangeListenerRegistered.countDown(); - // TODO: investigate why we do not receive data chage events - listener.waitForChangeEvents(); - }}; + // TODO: investigate why we do not receive data chage events + listener.waitForChangeEvents(); } @Test - public void testCreateTransaction(){ - new ShardTestKit(getSystem()) {{ - final ActorRef shard = actorFactory.createActor(newShardProps(), "testCreateTransaction"); + public void testCreateTransaction() { + final ShardTestKit testKit = new ShardTestKit(getSystem()); + final ActorRef shard = actorFactory.createActor(newShardProps(), "testCreateTransaction"); - waitUntilLeader(shard); + ShardTestKit.waitUntilLeader(shard); - shard.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); + shard.tell(new UpdateSchemaContext(TestModel.createTestContext()), testKit.getRef()); - shard.tell(new CreateTransaction(nextTransactionId(), TransactionType.READ_ONLY.ordinal(), - DataStoreVersions.CURRENT_VERSION).toSerializable(), getRef()); + shard.tell(new CreateTransaction(nextTransactionId(), TransactionType.READ_ONLY.ordinal(), + DataStoreVersions.CURRENT_VERSION).toSerializable(), testKit.getRef()); - final CreateTransactionReply reply = expectMsgClass(duration("3 seconds"), - CreateTransactionReply.class); + final CreateTransactionReply reply = testKit.expectMsgClass(Duration.ofSeconds(3), + CreateTransactionReply.class); - final String path = reply.getTransactionPath().toString(); - assertTrue("Unexpected transaction path " + path, - path.startsWith("akka://test/user/testCreateTransaction/shard-member-1:ShardTransactionTest@0:")); - }}; + final String path = reply.getTransactionPath().toString(); + assertTrue("Unexpected transaction path " + path, path.startsWith(String.format( + "akka://test/user/testCreateTransaction/shard-%s-%s:ShardTransactionTest@0:", + shardID.getShardName(), shardID.getMemberName().getName()))); } @Test - public void testCreateTransactionOnChain(){ - new ShardTestKit(getSystem()) {{ - final ActorRef shard = actorFactory.createActor(newShardProps(), "testCreateTransactionOnChain"); + public void testCreateTransactionOnChain() { + final ShardTestKit testKit = new ShardTestKit(getSystem()); + final ActorRef shard = actorFactory.createActor(newShardProps(), "testCreateTransactionOnChain"); - waitUntilLeader(shard); + ShardTestKit.waitUntilLeader(shard); - shard.tell(new CreateTransaction(nextTransactionId(),TransactionType.READ_ONLY.ordinal(), - DataStoreVersions.CURRENT_VERSION).toSerializable(), getRef()); + shard.tell(new CreateTransaction(nextTransactionId(), TransactionType.READ_ONLY.ordinal(), + DataStoreVersions.CURRENT_VERSION).toSerializable(), testKit.getRef()); - final CreateTransactionReply reply = expectMsgClass(duration("3 seconds"), - CreateTransactionReply.class); + final CreateTransactionReply reply = testKit.expectMsgClass(Duration.ofSeconds(3), + CreateTransactionReply.class); - final String path = reply.getTransactionPath().toString(); - assertTrue("Unexpected transaction path " + path, - path.startsWith("akka://test/user/testCreateTransactionOnChain/shard-member-1:ShardTransactionTest@0:")); - }}; + final String path = reply.getTransactionPath().toString(); + assertTrue("Unexpected transaction path " + path, path.startsWith(String.format( + "akka://test/user/testCreateTransactionOnChain/shard-%s-%s:ShardTransactionTest@0:", + shardID.getShardName(), shardID.getMemberName().getName()))); } @Test - public void testPeerAddressResolved() throws Exception { - new ShardTestKit(getSystem()) {{ - final ShardIdentifier peerID = ShardIdentifier.create("inventory", MemberName.forName("member-2"), "config"); - final TestActorRef shard = actorFactory.createTestActor(newShardBuilder(). - peerAddresses(Collections.singletonMap(peerID.toString(), null)).props(). - withDispatcher(Dispatchers.DefaultDispatcherId()), "testPeerAddressResolved"); - - final String address = "akka://foobar"; - shard.tell(new PeerAddressResolved(peerID.toString(), address), ActorRef.noSender()); - - shard.tell(GetOnDemandRaftState.INSTANCE, getRef()); - final OnDemandRaftState state = expectMsgClass(OnDemandRaftState.class); - assertEquals("getPeerAddress", address, state.getPeerAddresses().get(peerID.toString())); - }}; + public void testPeerAddressResolved() { + final ShardTestKit testKit = new ShardTestKit(getSystem()); + final ShardIdentifier peerID = ShardIdentifier.create("inventory", MemberName.forName("member-2"), + "config"); + final TestActorRef shard = actorFactory.createTestActor(newShardBuilder() + .peerAddresses(Collections.singletonMap(peerID.toString(), null)) + .props().withDispatcher(Dispatchers.DefaultDispatcherId()), "testPeerAddressResolved"); + + final String address = "akka://foobar"; + shard.tell(new PeerAddressResolved(peerID.toString(), address), ActorRef.noSender()); + + shard.tell(GetOnDemandRaftState.INSTANCE, testKit.getRef()); + final OnDemandRaftState state = testKit.expectMsgClass(OnDemandRaftState.class); + assertEquals("getPeerAddress", address, state.getPeerAddresses().get(peerID.toString())); } @Test public void testApplySnapshot() throws Exception { - final TestActorRef shard = actorFactory.createTestActor(newShardProps(). - withDispatcher(Dispatchers.DefaultDispatcherId()), "testApplySnapshot"); + final TestActorRef shard = actorFactory.createTestActor(newShardProps() + .withDispatcher(Dispatchers.DefaultDispatcherId()), "testApplySnapshot"); ShardTestKit.waitUntilLeader(shard); - final DataTree store = InMemoryDataTreeFactory.getInstance().create(TreeType.OPERATIONAL); - store.setSchemaContext(SCHEMA_CONTEXT); + final DataTree store = new InMemoryDataTreeFactory().create(DataTreeConfiguration.DEFAULT_OPERATIONAL, + SCHEMA_CONTEXT); final ContainerNode container = ImmutableContainerNodeBuilder.create().withNodeIdentifier( - new YangInstanceIdentifier.NodeIdentifier(TestModel.TEST_QNAME)). - withChild(ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).addChild( + new YangInstanceIdentifier.NodeIdentifier(TestModel.TEST_QNAME)) + .withChild(ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).addChild( ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1)).build()).build(); writeToStore(store, TestModel.TEST_PATH, container); @@ -428,19 +290,19 @@ public class ShardTest extends AbstractShardTest { final YangInstanceIdentifier root = YangInstanceIdentifier.EMPTY; final NormalizedNode expected = readStore(store, root); - final Snapshot snapshot = Snapshot.create(new MetadataShardDataTreeSnapshot(expected).serialize(), - Collections.emptyList(), 1, 2, 3, 4); + final Snapshot snapshot = Snapshot.create(new ShardSnapshotState(new MetadataShardDataTreeSnapshot(expected)), + Collections.emptyList(), 1, 2, 3, 4, -1, null, null); shard.tell(new ApplySnapshot(snapshot), ActorRef.noSender()); final Stopwatch sw = Stopwatch.createStarted(); - while(sw.elapsed(TimeUnit.SECONDS) <= 5) { + while (sw.elapsed(TimeUnit.SECONDS) <= 5) { Uninterruptibles.sleepUninterruptibly(75, TimeUnit.MILLISECONDS); try { assertEquals("Root node", expected, readStore(shard, root)); return; - } catch(final AssertionError e) { + } catch (final AssertionError e) { // try again } } @@ -455,15 +317,8 @@ public class ShardTest extends AbstractShardTest { ShardTestKit.waitUntilLeader(shard); - final DataTree store = InMemoryDataTreeFactory.getInstance().create(TreeType.OPERATIONAL); - store.setSchemaContext(SCHEMA_CONTEXT); - writeToStore(store, TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME)); - - final NormalizedNode root = readStore(store, YangInstanceIdentifier.EMPTY); - final Snapshot snapshot = Snapshot.create(new MetadataShardDataTreeSnapshot(root).serialize(), - Collections. emptyList(), 1, 2, 3, 4); - - shard.tell(new ApplySnapshot(snapshot), ActorRef.noSender()); + final DataTree store = new InMemoryDataTreeFactory().create(DataTreeConfiguration.DEFAULT_OPERATIONAL, + SCHEMA_CONTEXT); final DataTreeModification writeMod = store.takeSnapshot().newModification(); final ContainerNode node = ImmutableNodes.containerNode(TestModel.TEST_QNAME); @@ -471,17 +326,14 @@ public class ShardTest extends AbstractShardTest { writeMod.ready(); final TransactionIdentifier tx = nextTransactionId(); - final ApplyState applyState = new ApplyState(null, tx, - new ReplicatedLogImplEntry(1, 2, payloadForModification(store, writeMod, tx))); - - shard.tell(applyState, shard); + shard.underlyingActor().applyState(null, null, payloadForModification(store, writeMod, tx)); final Stopwatch sw = Stopwatch.createStarted(); - while(sw.elapsed(TimeUnit.SECONDS) <= 5) { + while (sw.elapsed(TimeUnit.SECONDS) <= 5) { Uninterruptibles.sleepUninterruptibly(75, TimeUnit.MILLISECONDS); final NormalizedNode actual = readStore(shard, TestModel.TEST_PATH); - if(actual != null) { + if (actual != null) { assertEquals("Applied state", node, actual); return; } @@ -501,7 +353,7 @@ public class ShardTest extends AbstractShardTest { InMemoryJournal.addEntry(shardID.toString(), 0, DUMMY_DATA); // Set up the InMemoryJournal. - InMemoryJournal.addEntry(shardID.toString(), 1, new ReplicatedLogImplEntry(0, 1, + InMemoryJournal.addEntry(shardID.toString(), 1, new SimpleReplicatedLogEntry(0, 1, payloadForModification(source, writeMod, nextTransactionId()))); final int nListEntries = 16; @@ -518,7 +370,7 @@ public class ShardTest extends AbstractShardTest { mod.merge(path, ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, i)); mod.ready(); - InMemoryJournal.addEntry(shardID.toString(), i+1, new ReplicatedLogImplEntry(i, 1, + InMemoryJournal.addEntry(shardID.toString(), i + 1, new SimpleReplicatedLogEntry(i, 1, payloadForModification(source, mod, nextTransactionId()))); } @@ -529,1003 +381,976 @@ public class ShardTest extends AbstractShardTest { } @Test - public void testConcurrentThreePhaseCommits() throws Throwable { - new ShardTestKit(getSystem()) {{ - final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testConcurrentThreePhaseCommits"); - - waitUntilLeader(shard); + @SuppressWarnings("checkstyle:IllegalCatch") + public void testConcurrentThreePhaseCommits() throws Exception { + final AtomicReference caughtEx = new AtomicReference<>(); + final CountDownLatch commitLatch = new CountDownLatch(2); - final TransactionIdentifier transactionID1 = nextTransactionId(); - final TransactionIdentifier transactionID2 = nextTransactionId(); - final TransactionIdentifier transactionID3 = nextTransactionId(); + final long timeoutSec = 5; + final Duration duration = Duration.ofSeconds(timeoutSec); + final Timeout timeout = Timeout.create(duration); - final Map cohortMap = setupCohortDecorator( - shard.underlyingActor(), transactionID1, transactionID2, transactionID3); - final CapturingShardDataTreeCohort cohort1 = cohortMap.get(transactionID1); - final CapturingShardDataTreeCohort cohort2 = cohortMap.get(transactionID2); - final CapturingShardDataTreeCohort cohort3 = cohortMap.get(transactionID3); + final TestActorRef shard = actorFactory.createTestActor( + newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), + "testConcurrentThreePhaseCommits"); - final long timeoutSec = 5; - final FiniteDuration duration = FiniteDuration.create(timeoutSec, TimeUnit.SECONDS); - final Timeout timeout = new Timeout(duration); + class OnFutureComplete extends OnComplete { + private final Class expRespType; - shard.tell(prepareBatchedModifications(transactionID1, TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME), false), getRef()); - final ReadyTransactionReply readyReply = ReadyTransactionReply.fromSerializable( - expectMsgClass(duration, ReadyTransactionReply.class)); - assertEquals("Cohort path", shard.path().toString(), readyReply.getCohortPath()); + OnFutureComplete(final Class expRespType) { + this.expRespType = expRespType; + } - // Send the CanCommitTransaction message for the first Tx. + @Override + public void onComplete(final Throwable error, final Object resp) { + if (error != null) { + caughtEx.set(new AssertionError(getClass().getSimpleName() + " failure", error)); + } else { + try { + assertEquals("Commit response type", expRespType, resp.getClass()); + onSuccess(resp); + } catch (final Exception e) { + caughtEx.set(e); + } + } + } - shard.tell(new CanCommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); - final CanCommitTransactionReply canCommitReply = CanCommitTransactionReply.fromSerializable( - expectMsgClass(duration, CanCommitTransactionReply.class)); - assertEquals("Can commit", true, canCommitReply.getCanCommit()); + void onSuccess(final Object resp) { + } + } - // Ready 2 more Tx's. + class OnCommitFutureComplete extends OnFutureComplete { + OnCommitFutureComplete() { + super(CommitTransactionReply.class); + } - shard.tell(prepareBatchedModifications(transactionID2, TestModel.OUTER_LIST_PATH, - ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build(), false), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); + @Override + public void onComplete(final Throwable error, final Object resp) { + super.onComplete(error, resp); + commitLatch.countDown(); + } + } - shard.tell(prepareBatchedModifications(transactionID3, YangInstanceIdentifier.builder(TestModel.OUTER_LIST_PATH) - .nodeWithKey(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1).build(), - ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1), false), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); + class OnCanCommitFutureComplete extends OnFutureComplete { + private final TransactionIdentifier transactionID; - // Send the CanCommitTransaction message for the next 2 Tx's. These should get queued and - // processed after the first Tx completes. + OnCanCommitFutureComplete(final TransactionIdentifier transactionID) { + super(CanCommitTransactionReply.class); + this.transactionID = transactionID; + } - final Future canCommitFuture1 = Patterns.ask(shard, - new CanCommitTransaction(transactionID2, CURRENT_VERSION).toSerializable(), timeout); + @Override + void onSuccess(final Object resp) { + final CanCommitTransactionReply canCommitReply = CanCommitTransactionReply.fromSerializable(resp); + assertTrue("Can commit", canCommitReply.getCanCommit()); - final Future canCommitFuture2 = Patterns.ask(shard, - new CanCommitTransaction(transactionID3, CURRENT_VERSION).toSerializable(), timeout); + final Future commitFuture = Patterns.ask(shard, + new CommitTransaction(transactionID, CURRENT_VERSION).toSerializable(), timeout); + commitFuture.onComplete(new OnCommitFutureComplete(), getSystem().dispatcher()); + } + } - // Send the CommitTransaction message for the first Tx. After it completes, it should - // trigger the 2nd Tx to proceed which should in turn then trigger the 3rd. + final ShardTestKit testKit = new ShardTestKit(getSystem()); + ShardTestKit.waitUntilLeader(shard); - shard.tell(new CommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(duration, CommitTransactionReply.class); + final TransactionIdentifier transactionID1 = nextTransactionId(); + final TransactionIdentifier transactionID2 = nextTransactionId(); + final TransactionIdentifier transactionID3 = nextTransactionId(); - // Wait for the next 2 Tx's to complete. + final Map cohortMap = setupCohortDecorator( + shard.underlyingActor(), transactionID1, transactionID2, transactionID3); + final CapturingShardDataTreeCohort cohort1 = cohortMap.get(transactionID1); + final CapturingShardDataTreeCohort cohort2 = cohortMap.get(transactionID2); + final CapturingShardDataTreeCohort cohort3 = cohortMap.get(transactionID3); - final AtomicReference caughtEx = new AtomicReference<>(); - final CountDownLatch commitLatch = new CountDownLatch(2); + shard.tell(prepareBatchedModifications(transactionID1, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), false), testKit.getRef()); + final ReadyTransactionReply readyReply = ReadyTransactionReply + .fromSerializable(testKit.expectMsgClass(duration, ReadyTransactionReply.class)); + assertEquals("Cohort path", shard.path().toString(), readyReply.getCohortPath()); + // Send the CanCommitTransaction message for the first Tx. - class OnFutureComplete extends OnComplete { - private final Class expRespType; + shard.tell(new CanCommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), testKit.getRef()); + final CanCommitTransactionReply canCommitReply = CanCommitTransactionReply + .fromSerializable(testKit.expectMsgClass(duration, CanCommitTransactionReply.class)); + assertTrue("Can commit", canCommitReply.getCanCommit()); - OnFutureComplete(final Class expRespType) { - this.expRespType = expRespType; - } + // Ready 2 more Tx's. - @Override - public void onComplete(final Throwable error, final Object resp) { - if(error != null) { - caughtEx.set(new AssertionError(getClass().getSimpleName() + " failure", error)); - } else { - try { - assertEquals("Commit response type", expRespType, resp.getClass()); - onSuccess(resp); - } catch (final Exception e) { - caughtEx.set(e); - } - } - } + shard.tell(prepareBatchedModifications(transactionID2, TestModel.OUTER_LIST_PATH, + ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build(), false), testKit.getRef()); + testKit.expectMsgClass(duration, ReadyTransactionReply.class); - void onSuccess(final Object resp) throws Exception { - } - } + shard.tell( + prepareBatchedModifications(transactionID3, + YangInstanceIdentifier.builder(TestModel.OUTER_LIST_PATH) + .nodeWithKey(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1).build(), + ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1), false), testKit.getRef()); + testKit.expectMsgClass(duration, ReadyTransactionReply.class); - class OnCommitFutureComplete extends OnFutureComplete { - OnCommitFutureComplete() { - super(CommitTransactionReply.class); - } + // Send the CanCommitTransaction message for the next 2 Tx's. + // These should get queued and + // processed after the first Tx completes. - @Override - public void onComplete(final Throwable error, final Object resp) { - super.onComplete(error, resp); - commitLatch.countDown(); - } - } + final Future canCommitFuture1 = Patterns.ask(shard, + new CanCommitTransaction(transactionID2, CURRENT_VERSION).toSerializable(), timeout); - class OnCanCommitFutureComplete extends OnFutureComplete { - private final TransactionIdentifier transactionID; + final Future canCommitFuture2 = Patterns.ask(shard, + new CanCommitTransaction(transactionID3, CURRENT_VERSION).toSerializable(), timeout); - OnCanCommitFutureComplete(final TransactionIdentifier transactionID) { - super(CanCommitTransactionReply.class); - this.transactionID = transactionID; - } + // Send the CommitTransaction message for the first Tx. After it + // completes, it should + // trigger the 2nd Tx to proceed which should in turn then + // trigger the 3rd. - @Override - void onSuccess(final Object resp) throws Exception { - final CanCommitTransactionReply canCommitReply = - CanCommitTransactionReply.fromSerializable(resp); - assertEquals("Can commit", true, canCommitReply.getCanCommit()); + shard.tell(new CommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), testKit.getRef()); + testKit.expectMsgClass(duration, CommitTransactionReply.class); - final Future commitFuture = Patterns.ask(shard, - new CommitTransaction(transactionID, CURRENT_VERSION).toSerializable(), timeout); - commitFuture.onComplete(new OnCommitFutureComplete(), getSystem().dispatcher()); - } - } + // Wait for the next 2 Tx's to complete. - canCommitFuture1.onComplete(new OnCanCommitFutureComplete(transactionID2), - getSystem().dispatcher()); + canCommitFuture1.onComplete(new OnCanCommitFutureComplete(transactionID2), getSystem().dispatcher()); - canCommitFuture2.onComplete(new OnCanCommitFutureComplete(transactionID3), - getSystem().dispatcher()); + canCommitFuture2.onComplete(new OnCanCommitFutureComplete(transactionID3), getSystem().dispatcher()); - final boolean done = commitLatch.await(timeoutSec, TimeUnit.SECONDS); + final boolean done = commitLatch.await(timeoutSec, TimeUnit.SECONDS); - if(caughtEx.get() != null) { - throw caughtEx.get(); - } + final Throwable t = caughtEx.get(); + if (t != null) { + Throwables.propagateIfPossible(t, Exception.class); + throw new RuntimeException(t); + } - assertEquals("Commits complete", true, done); + assertTrue("Commits complete", done); - final InOrder inOrder = inOrder(cohort1.getCanCommit(), cohort1.getPreCommit(), cohort1.getCommit(), - cohort2.getCanCommit(), cohort2.getPreCommit(), cohort2.getCommit(), cohort3.getCanCommit(), - cohort3.getPreCommit(), cohort3.getCommit()); - inOrder.verify(cohort1.getCanCommit()).onSuccess(any(Void.class)); - inOrder.verify(cohort1.getPreCommit()).onSuccess(any(DataTreeCandidate.class)); - inOrder.verify(cohort1.getCommit()).onSuccess(any(UnsignedLong.class)); - inOrder.verify(cohort2.getCanCommit()).onSuccess(any(Void.class)); - inOrder.verify(cohort2.getPreCommit()).onSuccess(any(DataTreeCandidate.class)); - inOrder.verify(cohort2.getCommit()).onSuccess(any(UnsignedLong.class)); - inOrder.verify(cohort3.getCanCommit()).onSuccess(any(Void.class)); - inOrder.verify(cohort3.getPreCommit()).onSuccess(any(DataTreeCandidate.class)); - inOrder.verify(cohort3.getCommit()).onSuccess(any(UnsignedLong.class)); +// final InOrder inOrder = inOrder(cohort1.getCanCommit(), cohort1.getPreCommit(), cohort1.getCommit(), +// cohort2.getCanCommit(), cohort2.getPreCommit(), cohort2.getCommit(), cohort3.getCanCommit(), +// cohort3.getPreCommit(), cohort3.getCommit()); +// inOrder.verify(cohort1.getCanCommit()).onSuccess(any(Void.class)); +// inOrder.verify(cohort1.getPreCommit()).onSuccess(any(DataTreeCandidate.class)); +// inOrder.verify(cohort2.getCanCommit()).onSuccess(any(Void.class)); +// inOrder.verify(cohort2.getPreCommit()).onSuccess(any(DataTreeCandidate.class)); +// inOrder.verify(cohort3.getCanCommit()).onSuccess(any(Void.class)); +// inOrder.verify(cohort3.getPreCommit()).onSuccess(any(DataTreeCandidate.class)); +// inOrder.verify(cohort1.getCommit()).onSuccess(any(UnsignedLong.class)); +// inOrder.verify(cohort2.getCommit()).onSuccess(any(UnsignedLong.class)); +// inOrder.verify(cohort3.getCommit()).onSuccess(any(UnsignedLong.class)); - // Verify data in the data store. + // Verify data in the data store. - verifyOuterListEntry(shard, 1); + verifyOuterListEntry(shard, 1); - verifyLastApplied(shard, 2); - }}; + verifyLastApplied(shard, 5); } @Test - public void testBatchedModificationsWithNoCommitOnReady() throws Throwable { - new ShardTestKit(getSystem()) {{ - final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testBatchedModificationsWithNoCommitOnReady"); + public void testBatchedModificationsWithNoCommitOnReady() { + final ShardTestKit testKit = new ShardTestKit(getSystem()); + final TestActorRef shard = actorFactory.createTestActor( + newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), + "testBatchedModificationsWithNoCommitOnReady"); - waitUntilLeader(shard); + ShardTestKit.waitUntilLeader(shard); - final TransactionIdentifier transactionID = nextTransactionId(); - final FiniteDuration duration = duration("5 seconds"); + final TransactionIdentifier transactionID = nextTransactionId(); + final Duration duration = Duration.ofSeconds(5); - // Send a BatchedModifications to start a transaction. + // Send a BatchedModifications to start a transaction. - shard.tell(newBatchedModifications(transactionID, TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME), false, false, 1), getRef()); - expectMsgClass(duration, BatchedModificationsReply.class); + shard.tell(newBatchedModifications(transactionID, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), false, false, 1), testKit.getRef()); + testKit.expectMsgClass(duration, BatchedModificationsReply.class); - // Send a couple more BatchedModifications. + // Send a couple more BatchedModifications. - shard.tell(newBatchedModifications(transactionID, TestModel.OUTER_LIST_PATH, - ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build(), false, false, 2), getRef()); - expectMsgClass(duration, BatchedModificationsReply.class); + shard.tell(newBatchedModifications(transactionID, TestModel.OUTER_LIST_PATH, + ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build(), false, false, 2), + testKit.getRef()); + testKit.expectMsgClass(duration, BatchedModificationsReply.class); - shard.tell(newBatchedModifications(transactionID, YangInstanceIdentifier.builder( - TestModel.OUTER_LIST_PATH).nodeWithKey(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1).build(), - ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1), true, false, 3), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); + shard.tell(newBatchedModifications(transactionID, + YangInstanceIdentifier.builder(TestModel.OUTER_LIST_PATH) + .nodeWithKey(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1).build(), + ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1), true, false, 3), + testKit.getRef()); + testKit.expectMsgClass(duration, ReadyTransactionReply.class); - // Send the CanCommitTransaction message. + // Send the CanCommitTransaction message. - shard.tell(new CanCommitTransaction(transactionID, CURRENT_VERSION).toSerializable(), getRef()); - final CanCommitTransactionReply canCommitReply = CanCommitTransactionReply.fromSerializable( - expectMsgClass(duration, CanCommitTransactionReply.class)); - assertEquals("Can commit", true, canCommitReply.getCanCommit()); + shard.tell(new CanCommitTransaction(transactionID, CURRENT_VERSION).toSerializable(), testKit.getRef()); + final CanCommitTransactionReply canCommitReply = CanCommitTransactionReply + .fromSerializable(testKit.expectMsgClass(duration, CanCommitTransactionReply.class)); + assertTrue("Can commit", canCommitReply.getCanCommit()); - // Send the CommitTransaction message. + // Send the CommitTransaction message. - shard.tell(new CommitTransaction(transactionID, CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(duration, CommitTransactionReply.class); + shard.tell(new CommitTransaction(transactionID, CURRENT_VERSION).toSerializable(), testKit.getRef()); + testKit.expectMsgClass(duration, CommitTransactionReply.class); - // Verify data in the data store. + // Verify data in the data store. - verifyOuterListEntry(shard, 1); - }}; + verifyOuterListEntry(shard, 1); } @Test - public void testBatchedModificationsWithCommitOnReady() throws Throwable { - new ShardTestKit(getSystem()) {{ - final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testBatchedModificationsWithCommitOnReady"); - - waitUntilLeader(shard); + public void testBatchedModificationsWithCommitOnReady() { + final ShardTestKit testKit = new ShardTestKit(getSystem()); + final TestActorRef shard = actorFactory.createTestActor( + newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), + "testBatchedModificationsWithCommitOnReady"); - final TransactionIdentifier transactionID = nextTransactionId(); - final FiniteDuration duration = duration("5 seconds"); + ShardTestKit.waitUntilLeader(shard); - // Send a BatchedModifications to start a transaction. + final TransactionIdentifier transactionID = nextTransactionId(); + final Duration duration = Duration.ofSeconds(5); - shard.tell(newBatchedModifications(transactionID, TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME), false, false, 1), getRef()); - expectMsgClass(duration, BatchedModificationsReply.class); + // Send a BatchedModifications to start a transaction. - // Send a couple more BatchedModifications. + shard.tell(newBatchedModifications(transactionID, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), false, false, 1), testKit.getRef()); + testKit.expectMsgClass(duration, BatchedModificationsReply.class); - shard.tell(newBatchedModifications(transactionID, TestModel.OUTER_LIST_PATH, - ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build(), false, false, 2), getRef()); - expectMsgClass(duration, BatchedModificationsReply.class); + // Send a couple more BatchedModifications. - shard.tell(newBatchedModifications(transactionID, YangInstanceIdentifier.builder( - TestModel.OUTER_LIST_PATH).nodeWithKey(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1).build(), - ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1), true, true, 3), getRef()); + shard.tell(newBatchedModifications(transactionID, TestModel.OUTER_LIST_PATH, + ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build(), false, false, 2), + testKit.getRef()); + testKit.expectMsgClass(duration, BatchedModificationsReply.class); - expectMsgClass(duration, CommitTransactionReply.class); + shard.tell(newBatchedModifications(transactionID, + YangInstanceIdentifier.builder(TestModel.OUTER_LIST_PATH) + .nodeWithKey(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1).build(), + ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1), true, true, 3), + testKit.getRef()); - // Verify data in the data store. + testKit.expectMsgClass(duration, CommitTransactionReply.class); - verifyOuterListEntry(shard, 1); - }}; + // Verify data in the data store. + verifyOuterListEntry(shard, 1); } - @Test(expected=IllegalStateException.class) - public void testBatchedModificationsReadyWithIncorrectTotalMessageCount() throws Throwable { - new ShardTestKit(getSystem()) {{ - final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testBatchedModificationsReadyWithIncorrectTotalMessageCount"); + @Test(expected = IllegalStateException.class) + public void testBatchedModificationsReadyWithIncorrectTotalMessageCount() throws Exception { + final ShardTestKit testKit = new ShardTestKit(getSystem()); + final TestActorRef shard = actorFactory.createTestActor( + newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), + "testBatchedModificationsReadyWithIncorrectTotalMessageCount"); - waitUntilLeader(shard); + ShardTestKit.waitUntilLeader(shard); - final TransactionIdentifier transactionID = nextTransactionId(); - final BatchedModifications batched = new BatchedModifications(transactionID, DataStoreVersions.CURRENT_VERSION); - batched.setReady(true); - batched.setTotalMessagesSent(2); + final TransactionIdentifier transactionID = nextTransactionId(); + final BatchedModifications batched = new BatchedModifications(transactionID, + DataStoreVersions.CURRENT_VERSION); + batched.setReady(); + batched.setTotalMessagesSent(2); - shard.tell(batched, getRef()); + shard.tell(batched, testKit.getRef()); - final Failure failure = expectMsgClass(duration("5 seconds"), akka.actor.Status.Failure.class); + final Failure failure = testKit.expectMsgClass(Duration.ofSeconds(5), Failure.class); - if(failure != null) { - throw failure.cause(); - } - }}; + if (failure != null) { + Throwables.propagateIfPossible(failure.cause(), Exception.class); + throw new RuntimeException(failure.cause()); + } } @Test - public void testBatchedModificationsWithOperationFailure() throws Throwable { - new ShardTestKit(getSystem()) {{ - final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testBatchedModificationsWithOperationFailure"); + public void testBatchedModificationsWithOperationFailure() { + final ShardTestKit testKit = new ShardTestKit(getSystem()); + final TestActorRef shard = actorFactory.createTestActor( + newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), + "testBatchedModificationsWithOperationFailure"); - waitUntilLeader(shard); + ShardTestKit.waitUntilLeader(shard); - // Test merge with invalid data. An exception should occur when the merge is applied. Note that - // write will not validate the children for performance reasons. + // Test merge with invalid data. An exception should occur when + // the merge is applied. Note that + // write will not validate the children for performance reasons. - final TransactionIdentifier transactionID = nextTransactionId(); + final TransactionIdentifier transactionID = nextTransactionId(); - final ContainerNode invalidData = ImmutableContainerNodeBuilder.create().withNodeIdentifier( - new YangInstanceIdentifier.NodeIdentifier(TestModel.TEST_QNAME)). - withChild(ImmutableNodes.leafNode(TestModel.JUNK_QNAME, "junk")).build(); + final ContainerNode invalidData = ImmutableContainerNodeBuilder.create() + .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(TestModel.TEST_QNAME)) + .withChild(ImmutableNodes.leafNode(TestModel.JUNK_QNAME, "junk")).build(); - BatchedModifications batched = new BatchedModifications(transactionID, CURRENT_VERSION); - batched.addModification(new MergeModification(TestModel.TEST_PATH, invalidData)); - shard.tell(batched, getRef()); - Failure failure = expectMsgClass(duration("5 seconds"), akka.actor.Status.Failure.class); + BatchedModifications batched = new BatchedModifications(transactionID, CURRENT_VERSION); + batched.addModification(new MergeModification(TestModel.TEST_PATH, invalidData)); + shard.tell(batched, testKit.getRef()); + Failure failure = testKit.expectMsgClass(Duration.ofSeconds(5), akka.actor.Status.Failure.class); - final Throwable cause = failure.cause(); + final Throwable cause = failure.cause(); - batched = new BatchedModifications(transactionID, DataStoreVersions.CURRENT_VERSION); - batched.setReady(true); - batched.setTotalMessagesSent(2); + batched = new BatchedModifications(transactionID, DataStoreVersions.CURRENT_VERSION); + batched.setReady(); + batched.setTotalMessagesSent(2); - shard.tell(batched, getRef()); + shard.tell(batched, testKit.getRef()); - failure = expectMsgClass(duration("5 seconds"), akka.actor.Status.Failure.class); - assertEquals("Failure cause", cause, failure.cause()); - }}; + failure = testKit.expectMsgClass(Duration.ofSeconds(5), akka.actor.Status.Failure.class); + assertEquals("Failure cause", cause, failure.cause()); } @Test - public void testBatchedModificationsOnTransactionChain() throws Throwable { - new ShardTestKit(getSystem()) {{ - final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testBatchedModificationsOnTransactionChain"); + public void testBatchedModificationsOnTransactionChain() { + final ShardTestKit testKit = new ShardTestKit(getSystem()); + final TestActorRef shard = actorFactory.createTestActor( + newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), + "testBatchedModificationsOnTransactionChain"); - waitUntilLeader(shard); + ShardTestKit.waitUntilLeader(shard); - final LocalHistoryIdentifier historyId = nextHistoryId(); - final TransactionIdentifier transactionID1 = new TransactionIdentifier(historyId, 0); - final TransactionIdentifier transactionID2 = new TransactionIdentifier(historyId, 1); + final LocalHistoryIdentifier historyId = nextHistoryId(); + final TransactionIdentifier transactionID1 = new TransactionIdentifier(historyId, 0); + final TransactionIdentifier transactionID2 = new TransactionIdentifier(historyId, 1); - final FiniteDuration duration = duration("5 seconds"); + final Duration duration = Duration.ofSeconds(5); - // Send a BatchedModifications to start a chained write transaction and ready it. + // Send a BatchedModifications to start a chained write + // transaction and ready it. - final ContainerNode containerNode = ImmutableNodes.containerNode(TestModel.TEST_QNAME); - final YangInstanceIdentifier path = TestModel.TEST_PATH; - shard.tell(newBatchedModifications(transactionID1, path, containerNode, true, false, 1), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); + final ContainerNode containerNode = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + final YangInstanceIdentifier path = TestModel.TEST_PATH; + shard.tell(newBatchedModifications(transactionID1, path, containerNode, true, false, 1), testKit.getRef()); + testKit.expectMsgClass(duration, ReadyTransactionReply.class); - // Create a read Tx on the same chain. + // Create a read Tx on the same chain. - shard.tell(new CreateTransaction(transactionID2, TransactionType.READ_ONLY.ordinal(), - DataStoreVersions.CURRENT_VERSION).toSerializable(), getRef()); + shard.tell(new CreateTransaction(transactionID2, TransactionType.READ_ONLY.ordinal(), + DataStoreVersions.CURRENT_VERSION).toSerializable(), testKit.getRef()); - final CreateTransactionReply createReply = expectMsgClass(duration("3 seconds"), CreateTransactionReply.class); + final CreateTransactionReply createReply = testKit.expectMsgClass(Duration.ofSeconds(3), + CreateTransactionReply.class); - getSystem().actorSelection(createReply.getTransactionPath()).tell( - new ReadData(path, DataStoreVersions.CURRENT_VERSION), getRef()); - final ReadDataReply readReply = expectMsgClass(duration("3 seconds"), ReadDataReply.class); - assertEquals("Read node", containerNode, readReply.getNormalizedNode()); + getSystem().actorSelection(createReply.getTransactionPath()) + .tell(new ReadData(path, DataStoreVersions.CURRENT_VERSION), testKit.getRef()); + final ReadDataReply readReply = testKit.expectMsgClass(Duration.ofSeconds(3), ReadDataReply.class); + assertEquals("Read node", containerNode, readReply.getNormalizedNode()); - // Commit the write transaction. + // Commit the write transaction. - shard.tell(new CanCommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); - final CanCommitTransactionReply canCommitReply = CanCommitTransactionReply.fromSerializable( - expectMsgClass(duration, CanCommitTransactionReply.class)); - assertEquals("Can commit", true, canCommitReply.getCanCommit()); + shard.tell(new CanCommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), testKit.getRef()); + final CanCommitTransactionReply canCommitReply = CanCommitTransactionReply + .fromSerializable(testKit.expectMsgClass(duration, CanCommitTransactionReply.class)); + assertTrue("Can commit", canCommitReply.getCanCommit()); - shard.tell(new CommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(duration, CommitTransactionReply.class); + shard.tell(new CommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), testKit.getRef()); + testKit.expectMsgClass(duration, CommitTransactionReply.class); - // Verify data in the data store. + // Verify data in the data store. - final NormalizedNode actualNode = readStore(shard, path); - assertEquals("Stored node", containerNode, actualNode); - }}; + final NormalizedNode actualNode = readStore(shard, path); + assertEquals("Stored node", containerNode, actualNode); } @Test public void testOnBatchedModificationsWhenNotLeader() { final AtomicBoolean overrideLeaderCalls = new AtomicBoolean(); - new ShardTestKit(getSystem()) {{ - final Creator creator = new Creator() { - private static final long serialVersionUID = 1L; - - @Override - public Shard create() throws Exception { - return new Shard(newShardBuilder()) { - @Override - protected boolean isLeader() { - return overrideLeaderCalls.get() ? false : super.isLeader(); - } + final ShardTestKit testKit = new ShardTestKit(getSystem()); + final Creator creator = new Creator() { + private static final long serialVersionUID = 1L; - @Override - protected ActorSelection getLeader() { - return overrideLeaderCalls.get() ? getSystem().actorSelection(getRef().path()) : - super.getLeader(); - } - }; - } - }; + @Override + public Shard create() { + return new Shard(newShardBuilder()) { + @Override + protected boolean isLeader() { + return overrideLeaderCalls.get() ? false : super.isLeader(); + } + + @Override + public ActorSelection getLeader() { + return overrideLeaderCalls.get() ? getSystem().actorSelection(testKit.getRef().path()) + : super.getLeader(); + } + }; + } + }; - final TestActorRef shard = actorFactory.createTestActor( - Props.create(new DelegatingShardCreator(creator)). - withDispatcher(Dispatchers.DefaultDispatcherId()), "testOnBatchedModificationsWhenNotLeader"); + final TestActorRef shard = actorFactory.createTestActor(Props + .create(new DelegatingShardCreator(creator)).withDispatcher(Dispatchers.DefaultDispatcherId()), + "testOnBatchedModificationsWhenNotLeader"); - waitUntilLeader(shard); + ShardTestKit.waitUntilLeader(shard); - overrideLeaderCalls.set(true); + overrideLeaderCalls.set(true); - final BatchedModifications batched = new BatchedModifications(nextTransactionId(), DataStoreVersions.CURRENT_VERSION); + final BatchedModifications batched = new BatchedModifications(nextTransactionId(), + DataStoreVersions.CURRENT_VERSION); - shard.tell(batched, ActorRef.noSender()); + shard.tell(batched, ActorRef.noSender()); - expectMsgEquals(batched); - }}; + testKit.expectMsgEquals(batched); } @Test public void testTransactionMessagesWithNoLeader() { - new ShardTestKit(getSystem()) {{ - dataStoreContextBuilder.customRaftPolicyImplementation(DisableElectionsRaftPolicy.class.getName()). - shardHeartbeatIntervalInMillis(50).shardElectionTimeoutFactor(1); - final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testTransactionMessagesWithNoLeader"); - - waitUntilNoLeader(shard); - - final TransactionIdentifier txId = nextTransactionId(); - shard.tell(new BatchedModifications(txId, DataStoreVersions.CURRENT_VERSION), getRef()); - Failure failure = expectMsgClass(Failure.class); - assertEquals("Failure cause type", NoShardLeaderException.class, failure.cause().getClass()); - - shard.tell(prepareForwardedReadyTransaction(shard, txId, TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME), true), getRef()); - failure = expectMsgClass(Failure.class); - assertEquals("Failure cause type", NoShardLeaderException.class, failure.cause().getClass()); - - shard.tell(new ReadyLocalTransaction(txId, mock(DataTreeModification.class), true), getRef()); - failure = expectMsgClass(Failure.class); - assertEquals("Failure cause type", NoShardLeaderException.class, failure.cause().getClass()); - }}; + final ShardTestKit testKit = new ShardTestKit(getSystem()); + dataStoreContextBuilder.customRaftPolicyImplementation(DisableElectionsRaftPolicy.class.getName()) + .shardHeartbeatIntervalInMillis(50).shardElectionTimeoutFactor(1); + final TestActorRef shard = actorFactory.createTestActor( + newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), + "testTransactionMessagesWithNoLeader"); + + testKit.waitUntilNoLeader(shard); + + final TransactionIdentifier txId = nextTransactionId(); + shard.tell(new BatchedModifications(txId, DataStoreVersions.CURRENT_VERSION), testKit.getRef()); + Failure failure = testKit.expectMsgClass(Failure.class); + assertEquals("Failure cause type", NoShardLeaderException.class, failure.cause().getClass()); + + shard.tell(prepareForwardedReadyTransaction(shard, txId, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), true), testKit.getRef()); + failure = testKit.expectMsgClass(Failure.class); + assertEquals("Failure cause type", NoShardLeaderException.class, failure.cause().getClass()); + + shard.tell(new ReadyLocalTransaction(txId, mock(DataTreeModification.class), true, Optional.empty()), + testKit.getRef()); + failure = testKit.expectMsgClass(Failure.class); + assertEquals("Failure cause type", NoShardLeaderException.class, failure.cause().getClass()); } @Test - public void testReadyWithReadWriteImmediateCommit() throws Exception{ + public void testReadyWithReadWriteImmediateCommit() { testReadyWithImmediateCommit(true); } @Test - public void testReadyWithWriteOnlyImmediateCommit() throws Exception{ + public void testReadyWithWriteOnlyImmediateCommit() { testReadyWithImmediateCommit(false); } - private void testReadyWithImmediateCommit(final boolean readWrite) throws Exception{ - new ShardTestKit(getSystem()) {{ - final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testReadyWithImmediateCommit-" + readWrite); - - waitUntilLeader(shard); - - final TransactionIdentifier transactionID = nextTransactionId(); - final NormalizedNode containerNode = ImmutableNodes.containerNode(TestModel.TEST_QNAME); - if(readWrite) { - shard.tell(prepareForwardedReadyTransaction(shard, transactionID, TestModel.TEST_PATH, - containerNode, true), getRef()); - } else { - shard.tell(prepareBatchedModifications(transactionID, TestModel.TEST_PATH, containerNode, true), getRef()); - } + private void testReadyWithImmediateCommit(final boolean readWrite) { + final ShardTestKit testKit = new ShardTestKit(getSystem()); + final TestActorRef shard = actorFactory.createTestActor( + newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), + "testReadyWithImmediateCommit-" + readWrite); + + ShardTestKit.waitUntilLeader(shard); + + final TransactionIdentifier transactionID = nextTransactionId(); + final NormalizedNode containerNode = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + if (readWrite) { + shard.tell(prepareForwardedReadyTransaction(shard, transactionID, TestModel.TEST_PATH, containerNode, true), + testKit.getRef()); + } else { + shard.tell(prepareBatchedModifications(transactionID, TestModel.TEST_PATH, containerNode, true), + testKit.getRef()); + } - expectMsgClass(duration("5 seconds"), CommitTransactionReply.class); + testKit.expectMsgClass(Duration.ofSeconds(5), CommitTransactionReply.class); - final NormalizedNode actualNode = readStore(shard, TestModel.TEST_PATH); - assertEquals(TestModel.TEST_QNAME.getLocalName(), containerNode, actualNode); - }}; + final NormalizedNode actualNode = readStore(shard, TestModel.TEST_PATH); + assertEquals(TestModel.TEST_QNAME.getLocalName(), containerNode, actualNode); } @Test - public void testReadyLocalTransactionWithImmediateCommit() throws Exception{ - new ShardTestKit(getSystem()) {{ - final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testReadyLocalTransactionWithImmediateCommit"); + public void testReadyLocalTransactionWithImmediateCommit() { + final ShardTestKit testKit = new ShardTestKit(getSystem()); + final TestActorRef shard = actorFactory.createTestActor( + newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), + "testReadyLocalTransactionWithImmediateCommit"); - waitUntilLeader(shard); + ShardTestKit.waitUntilLeader(shard); - final ShardDataTree dataStore = shard.underlyingActor().getDataStore(); + final ShardDataTree dataStore = shard.underlyingActor().getDataStore(); - final DataTreeModification modification = dataStore.newModification(); + final DataTreeModification modification = dataStore.newModification(); - final ContainerNode writeData = ImmutableNodes.containerNode(TestModel.TEST_QNAME); - new WriteModification(TestModel.TEST_PATH, writeData).apply(modification); - final MapNode mergeData = ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build(); - new MergeModification(TestModel.OUTER_LIST_PATH, mergeData).apply(modification); + final ContainerNode writeData = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + new WriteModification(TestModel.TEST_PATH, writeData).apply(modification); + final MapNode mergeData = ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME) + .addChild(ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 42)) + .build(); + new MergeModification(TestModel.OUTER_LIST_PATH, mergeData).apply(modification); - final TransactionIdentifier txId = nextTransactionId(); - modification.ready(); - final ReadyLocalTransaction readyMessage = new ReadyLocalTransaction(txId, modification, true); + final TransactionIdentifier txId = nextTransactionId(); + modification.ready(); + final ReadyLocalTransaction readyMessage = + new ReadyLocalTransaction(txId, modification, true, Optional.empty()); - shard.tell(readyMessage, getRef()); + shard.tell(readyMessage, testKit.getRef()); - expectMsgClass(CommitTransactionReply.class); + testKit.expectMsgClass(CommitTransactionReply.class); - final NormalizedNode actualNode = readStore(shard, TestModel.OUTER_LIST_PATH); - assertEquals(TestModel.OUTER_LIST_QNAME.getLocalName(), mergeData, actualNode); - }}; + final NormalizedNode actualNode = readStore(shard, TestModel.OUTER_LIST_PATH); + assertEquals(TestModel.OUTER_LIST_QNAME.getLocalName(), mergeData, actualNode); } @Test - public void testReadyLocalTransactionWithThreePhaseCommit() throws Exception{ - new ShardTestKit(getSystem()) {{ - final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testReadyLocalTransactionWithThreePhaseCommit"); + public void testReadyLocalTransactionWithThreePhaseCommit() { + final ShardTestKit testKit = new ShardTestKit(getSystem()); + final TestActorRef shard = actorFactory.createTestActor( + newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), + "testReadyLocalTransactionWithThreePhaseCommit"); - waitUntilLeader(shard); + ShardTestKit.waitUntilLeader(shard); - final ShardDataTree dataStore = shard.underlyingActor().getDataStore(); + final ShardDataTree dataStore = shard.underlyingActor().getDataStore(); - final DataTreeModification modification = dataStore.newModification(); + final DataTreeModification modification = dataStore.newModification(); - final ContainerNode writeData = ImmutableNodes.containerNode(TestModel.TEST_QNAME); - new WriteModification(TestModel.TEST_PATH, writeData).apply(modification); - final MapNode mergeData = ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build(); - new MergeModification(TestModel.OUTER_LIST_PATH, mergeData).apply(modification); + final ContainerNode writeData = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + new WriteModification(TestModel.TEST_PATH, writeData).apply(modification); + final MapNode mergeData = ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME) + .addChild(ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 42)) + .build(); + new MergeModification(TestModel.OUTER_LIST_PATH, mergeData).apply(modification); - final TransactionIdentifier txId = nextTransactionId(); - modification.ready(); - final ReadyLocalTransaction readyMessage = new ReadyLocalTransaction(txId, modification, false); + final TransactionIdentifier txId = nextTransactionId(); + modification.ready(); + final ReadyLocalTransaction readyMessage = + new ReadyLocalTransaction(txId, modification, false, Optional.empty()); - shard.tell(readyMessage, getRef()); + shard.tell(readyMessage, testKit.getRef()); - expectMsgClass(ReadyTransactionReply.class); + testKit.expectMsgClass(ReadyTransactionReply.class); - // Send the CanCommitTransaction message. + // Send the CanCommitTransaction message. - shard.tell(new CanCommitTransaction(txId, CURRENT_VERSION).toSerializable(), getRef()); - final CanCommitTransactionReply canCommitReply = CanCommitTransactionReply.fromSerializable( - expectMsgClass(CanCommitTransactionReply.class)); - assertEquals("Can commit", true, canCommitReply.getCanCommit()); + shard.tell(new CanCommitTransaction(txId, CURRENT_VERSION).toSerializable(), testKit.getRef()); + final CanCommitTransactionReply canCommitReply = CanCommitTransactionReply + .fromSerializable(testKit.expectMsgClass(CanCommitTransactionReply.class)); + assertTrue("Can commit", canCommitReply.getCanCommit()); - // Send the CanCommitTransaction message. + // Send the CanCommitTransaction message. - shard.tell(new CommitTransaction(txId, CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(CommitTransactionReply.class); + shard.tell(new CommitTransaction(txId, CURRENT_VERSION).toSerializable(), testKit.getRef()); + testKit.expectMsgClass(CommitTransactionReply.class); - final NormalizedNode actualNode = readStore(shard, TestModel.OUTER_LIST_PATH); - assertEquals(TestModel.OUTER_LIST_QNAME.getLocalName(), mergeData, actualNode); - }}; + final NormalizedNode actualNode = readStore(shard, TestModel.OUTER_LIST_PATH); + assertEquals(TestModel.OUTER_LIST_QNAME.getLocalName(), mergeData, actualNode); } @Test - public void testReadWriteCommitWithPersistenceDisabled() throws Throwable { + public void testReadWriteCommitWithPersistenceDisabled() { dataStoreContextBuilder.persistent(false); - new ShardTestKit(getSystem()) {{ - final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testCommitWithPersistenceDisabled"); + final ShardTestKit testKit = new ShardTestKit(getSystem()); + final TestActorRef shard = actorFactory.createTestActor( + newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), + "testCommitWithPersistenceDisabled"); - waitUntilLeader(shard); + ShardTestKit.waitUntilLeader(shard); - // Setup a simulated transactions with a mock cohort. + // Setup a simulated transactions with a mock cohort. - final FiniteDuration duration = duration("5 seconds"); + final Duration duration = Duration.ofSeconds(5); - final TransactionIdentifier transactionID = nextTransactionId(); - final NormalizedNode containerNode = ImmutableNodes.containerNode(TestModel.TEST_QNAME); - shard.tell(prepareBatchedModifications(transactionID, TestModel.TEST_PATH, containerNode, false), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); + final TransactionIdentifier transactionID = nextTransactionId(); + final NormalizedNode containerNode = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + shard.tell(prepareBatchedModifications(transactionID, TestModel.TEST_PATH, containerNode, false), + testKit.getRef()); + testKit.expectMsgClass(duration, ReadyTransactionReply.class); - // Send the CanCommitTransaction message. + // Send the CanCommitTransaction message. - shard.tell(new CanCommitTransaction(transactionID, CURRENT_VERSION).toSerializable(), getRef()); - final CanCommitTransactionReply canCommitReply = CanCommitTransactionReply.fromSerializable( - expectMsgClass(duration, CanCommitTransactionReply.class)); - assertEquals("Can commit", true, canCommitReply.getCanCommit()); + shard.tell(new CanCommitTransaction(transactionID, CURRENT_VERSION).toSerializable(), testKit.getRef()); + final CanCommitTransactionReply canCommitReply = CanCommitTransactionReply + .fromSerializable(testKit.expectMsgClass(duration, CanCommitTransactionReply.class)); + assertTrue("Can commit", canCommitReply.getCanCommit()); - // Send the CanCommitTransaction message. + // Send the CanCommitTransaction message. - shard.tell(new CommitTransaction(transactionID, CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(duration, CommitTransactionReply.class); + shard.tell(new CommitTransaction(transactionID, CURRENT_VERSION).toSerializable(), testKit.getRef()); + testKit.expectMsgClass(duration, CommitTransactionReply.class); - final NormalizedNode actualNode = readStore(shard, TestModel.TEST_PATH); - assertEquals(TestModel.TEST_QNAME.getLocalName(), containerNode, actualNode); - }}; + final NormalizedNode actualNode = readStore(shard, TestModel.TEST_PATH); + assertEquals(TestModel.TEST_QNAME.getLocalName(), containerNode, actualNode); } @Test - public void testReadWriteCommitWhenTransactionHasNoModifications() { - testCommitWhenTransactionHasNoModifications(true); + public void testReadWriteCommitWhenTransactionHasModifications() throws Exception { + testCommitWhenTransactionHasModifications(true); } @Test - public void testWriteOnlyCommitWhenTransactionHasNoModifications() { - testCommitWhenTransactionHasNoModifications(false); + public void testWriteOnlyCommitWhenTransactionHasModifications() throws Exception { + testCommitWhenTransactionHasModifications(false); } - private void testCommitWhenTransactionHasNoModifications(final boolean readWrite){ - // Note that persistence is enabled which would normally result in the entry getting written to the journal - // but here that need not happen - new ShardTestKit(getSystem()) {{ - final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testCommitWhenTransactionHasNoModifications-" + readWrite); + private void testCommitWhenTransactionHasModifications(final boolean readWrite) throws Exception { + final ShardTestKit testKit = new ShardTestKit(getSystem()); + final DataTree dataTree = createDelegatingMockDataTree(); + final TestActorRef shard = actorFactory.createTestActor( + newShardBuilder().dataTree(dataTree).props().withDispatcher(Dispatchers.DefaultDispatcherId()), + "testCommitWhenTransactionHasModifications-" + readWrite); - waitUntilLeader(shard); + ShardTestKit.waitUntilLeader(shard); - final TransactionIdentifier transactionID = nextTransactionId(); + final Duration duration = Duration.ofSeconds(5); + final TransactionIdentifier transactionID = nextTransactionId(); - final FiniteDuration duration = duration("5 seconds"); + if (readWrite) { + shard.tell(prepareForwardedReadyTransaction(shard, transactionID, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), false), testKit.getRef()); + } else { + shard.tell(prepareBatchedModifications(transactionID, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), false), testKit.getRef()); + } - if(readWrite) { - final ReadWriteShardDataTreeTransaction rwTx = shard.underlyingActor().getDataStore(). - newReadWriteTransaction(transactionID); - shard.tell(new ForwardedReadyTransaction(transactionID, CURRENT_VERSION, rwTx, false), getRef()); - } else { - shard.tell(prepareBatchedModifications(transactionID, new MutableCompositeModification()), getRef()); - } + testKit.expectMsgClass(duration, ReadyTransactionReply.class); - expectMsgClass(duration, ReadyTransactionReply.class); + // Send the CanCommitTransaction message. - // Send the CanCommitTransaction message. + shard.tell(new CanCommitTransaction(transactionID, CURRENT_VERSION).toSerializable(), testKit.getRef()); + final CanCommitTransactionReply canCommitReply = CanCommitTransactionReply + .fromSerializable(testKit.expectMsgClass(duration, CanCommitTransactionReply.class)); + assertTrue("Can commit", canCommitReply.getCanCommit()); - shard.tell(new CanCommitTransaction(transactionID, CURRENT_VERSION).toSerializable(), getRef()); - final CanCommitTransactionReply canCommitReply = CanCommitTransactionReply.fromSerializable( - expectMsgClass(duration, CanCommitTransactionReply.class)); - assertEquals("Can commit", true, canCommitReply.getCanCommit()); + shard.tell(new CommitTransaction(transactionID, CURRENT_VERSION).toSerializable(), testKit.getRef()); + testKit.expectMsgClass(duration, CommitTransactionReply.class); - shard.tell(new CommitTransaction(transactionID, CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(duration, CommitTransactionReply.class); + final InOrder inOrder = inOrder(dataTree); + inOrder.verify(dataTree).validate(any(DataTreeModification.class)); + inOrder.verify(dataTree).prepare(any(DataTreeModification.class)); + inOrder.verify(dataTree).commit(any(DataTreeCandidate.class)); - shard.tell(Shard.GET_SHARD_MBEAN_MESSAGE, getRef()); - final ShardStats shardStats = expectMsgClass(duration, ShardStats.class); + // Purge request is scheduled as asynchronous, wait for two heartbeats to let it propagate into + // the journal + Thread.sleep(HEARTBEAT_MILLIS * 2); - // Use MBean for verification - // Committed transaction count should increase as usual - assertEquals(1,shardStats.getCommittedTransactionsCount()); + shard.tell(Shard.GET_SHARD_MBEAN_MESSAGE, testKit.getRef()); + final ShardStats shardStats = testKit.expectMsgClass(duration, ShardStats.class); - // Commit index should not advance because this does not go into the journal - assertEquals(-1, shardStats.getCommitIndex()); - }}; - } + // Use MBean for verification + // Committed transaction count should increase as usual + assertEquals(1, shardStats.getCommittedTransactionsCount()); - @Test - public void testReadWriteCommitWhenTransactionHasModifications() throws Exception { - testCommitWhenTransactionHasModifications(true); + // Commit index should advance as we do not have an empty + // modification + assertEquals(1, shardStats.getCommitIndex()); } @Test - public void testWriteOnlyCommitWhenTransactionHasModifications() throws Exception { - testCommitWhenTransactionHasModifications(false); - } - - private void testCommitWhenTransactionHasModifications(final boolean readWrite) throws Exception { - new ShardTestKit(getSystem()) {{ - final TipProducingDataTree dataTree = createDelegatingMockDataTree(); - final TestActorRef shard = actorFactory.createTestActor( - newShardBuilder().dataTree(dataTree).props().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testCommitWhenTransactionHasModifications-" + readWrite); - - waitUntilLeader(shard); - - final FiniteDuration duration = duration("5 seconds"); - final TransactionIdentifier transactionID = nextTransactionId(); - - if(readWrite) { - shard.tell(prepareForwardedReadyTransaction(shard, transactionID, TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME), false), getRef()); - } else { - shard.tell(prepareBatchedModifications(transactionID, TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME), false), getRef()); - } - - expectMsgClass(duration, ReadyTransactionReply.class); - - // Send the CanCommitTransaction message. - - shard.tell(new CanCommitTransaction(transactionID, CURRENT_VERSION).toSerializable(), getRef()); - final CanCommitTransactionReply canCommitReply = CanCommitTransactionReply.fromSerializable( - expectMsgClass(duration, CanCommitTransactionReply.class)); - assertEquals("Can commit", true, canCommitReply.getCanCommit()); - - shard.tell(new CommitTransaction(transactionID, CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(duration, CommitTransactionReply.class); - - final InOrder inOrder = inOrder(dataTree); - inOrder.verify(dataTree).validate(any(DataTreeModification.class)); - inOrder.verify(dataTree).prepare(any(DataTreeModification.class)); - inOrder.verify(dataTree).commit(any(DataTreeCandidate.class)); - - shard.tell(Shard.GET_SHARD_MBEAN_MESSAGE, getRef()); - final ShardStats shardStats = expectMsgClass(duration, ShardStats.class); - - // Use MBean for verification - // Committed transaction count should increase as usual - assertEquals(1, shardStats.getCommittedTransactionsCount()); + public void testCommitPhaseFailure() throws Exception { + final ShardTestKit testKit = new ShardTestKit(getSystem()); + final DataTree dataTree = createDelegatingMockDataTree(); + final TestActorRef shard = actorFactory.createTestActor( + newShardBuilder().dataTree(dataTree).props().withDispatcher(Dispatchers.DefaultDispatcherId()), + "testCommitPhaseFailure"); - // Commit index should advance as we do not have an empty modification - assertEquals(0, shardStats.getCommitIndex()); - }}; - } + ShardTestKit.waitUntilLeader(shard); - @Test - public void testCommitPhaseFailure() throws Throwable { - new ShardTestKit(getSystem()) {{ - final TipProducingDataTree dataTree = createDelegatingMockDataTree(); - final TestActorRef shard = actorFactory.createTestActor( - newShardBuilder().dataTree(dataTree).props().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testCommitPhaseFailure"); + final Duration duration = Duration.ofSeconds(5); + final Timeout timeout = Timeout.create(duration); - waitUntilLeader(shard); + // Setup 2 simulated transactions with mock cohorts. The first + // one fails in the + // commit phase. - final FiniteDuration duration = duration("5 seconds"); - final Timeout timeout = new Timeout(duration); + doThrow(new RuntimeException("mock commit failure")).when(dataTree) + .commit(any(DataTreeCandidate.class)); - // Setup 2 simulated transactions with mock cohorts. The first one fails in the - // commit phase. + final TransactionIdentifier transactionID1 = nextTransactionId(); + shard.tell(newBatchedModifications(transactionID1, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), true, false, 1), testKit.getRef()); + testKit.expectMsgClass(duration, ReadyTransactionReply.class); - doThrow(new RuntimeException("mock commit failure")).when(dataTree).commit(any(DataTreeCandidate.class)); + final TransactionIdentifier transactionID2 = nextTransactionId(); + shard.tell(newBatchedModifications(transactionID2, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), true, false, 1), testKit.getRef()); + testKit.expectMsgClass(duration, ReadyTransactionReply.class); - final TransactionIdentifier transactionID1 = nextTransactionId(); - shard.tell(newBatchedModifications(transactionID1, TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME), true, false, 1), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); + // Send the CanCommitTransaction message for the first Tx. - final TransactionIdentifier transactionID2 = nextTransactionId(); - shard.tell(newBatchedModifications(transactionID2, TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME), true, false, 1), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); + shard.tell(new CanCommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), testKit.getRef()); + final CanCommitTransactionReply canCommitReply = CanCommitTransactionReply + .fromSerializable(testKit.expectMsgClass(duration, CanCommitTransactionReply.class)); + assertTrue("Can commit", canCommitReply.getCanCommit()); - // Send the CanCommitTransaction message for the first Tx. + // Send the CanCommitTransaction message for the 2nd Tx. This + // should get queued and + // processed after the first Tx completes. - shard.tell(new CanCommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); - final CanCommitTransactionReply canCommitReply = CanCommitTransactionReply.fromSerializable( - expectMsgClass(duration, CanCommitTransactionReply.class)); - assertEquals("Can commit", true, canCommitReply.getCanCommit()); + final Future canCommitFuture = Patterns.ask(shard, + new CanCommitTransaction(transactionID2, CURRENT_VERSION).toSerializable(), timeout); - // Send the CanCommitTransaction message for the 2nd Tx. This should get queued and - // processed after the first Tx completes. + // Send the CommitTransaction message for the first Tx. This + // should send back an error + // and trigger the 2nd Tx to proceed. - final Future canCommitFuture = Patterns.ask(shard, - new CanCommitTransaction(transactionID2, CURRENT_VERSION).toSerializable(), timeout); + shard.tell(new CommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), testKit.getRef()); + testKit.expectMsgClass(duration, akka.actor.Status.Failure.class); - // Send the CommitTransaction message for the first Tx. This should send back an error - // and trigger the 2nd Tx to proceed. + // Wait for the 2nd Tx to complete the canCommit phase. - shard.tell(new CommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(duration, akka.actor.Status.Failure.class); + final CountDownLatch latch = new CountDownLatch(1); + canCommitFuture.onComplete(new OnComplete() { + @Override + public void onComplete(final Throwable failure, final Object resp) { + latch.countDown(); + } + }, getSystem().dispatcher()); - // Wait for the 2nd Tx to complete the canCommit phase. + assertTrue("2nd CanCommit complete", latch.await(5, TimeUnit.SECONDS)); - final CountDownLatch latch = new CountDownLatch(1); - canCommitFuture.onComplete(new OnComplete() { - @Override - public void onComplete(final Throwable t, final Object resp) { - latch.countDown(); - } - }, getSystem().dispatcher()); + final InOrder inOrder = inOrder(dataTree); + inOrder.verify(dataTree).validate(any(DataTreeModification.class)); + inOrder.verify(dataTree).prepare(any(DataTreeModification.class)); - assertEquals("2nd CanCommit complete", true, latch.await(5, TimeUnit.SECONDS)); + // FIXME: this invocation is done on the result of validate(). To test it, we need to make sure mock + // validate performs wrapping and we capture that mock + // inOrder.verify(dataTree).validate(any(DataTreeModification.class)); - final InOrder inOrder = inOrder(dataTree); - inOrder.verify(dataTree).validate(any(DataTreeModification.class)); - inOrder.verify(dataTree).prepare(any(DataTreeModification.class)); - inOrder.verify(dataTree).commit(any(DataTreeCandidate.class)); - inOrder.verify(dataTree).validate(any(DataTreeModification.class)); - }}; + inOrder.verify(dataTree).commit(any(DataTreeCandidate.class)); } @Test - public void testPreCommitPhaseFailure() throws Throwable { - new ShardTestKit(getSystem()) {{ - final TipProducingDataTree dataTree = createDelegatingMockDataTree(); - final TestActorRef shard = actorFactory.createTestActor( - newShardBuilder().dataTree(dataTree).props().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testPreCommitPhaseFailure"); + public void testPreCommitPhaseFailure() throws Exception { + final ShardTestKit testKit = new ShardTestKit(getSystem()); + final DataTree dataTree = createDelegatingMockDataTree(); + final TestActorRef shard = actorFactory.createTestActor( + newShardBuilder().dataTree(dataTree).props().withDispatcher(Dispatchers.DefaultDispatcherId()), + "testPreCommitPhaseFailure"); - waitUntilLeader(shard); + ShardTestKit.waitUntilLeader(shard); - final FiniteDuration duration = duration("5 seconds"); - final Timeout timeout = new Timeout(duration); + final Duration duration = Duration.ofSeconds(5); + final Timeout timeout = Timeout.create(duration); - doThrow(new RuntimeException("mock preCommit failure")).when(dataTree).prepare(any(DataTreeModification.class)); + doThrow(new RuntimeException("mock preCommit failure")).when(dataTree) + .prepare(any(DataTreeModification.class)); - final TransactionIdentifier transactionID1 = nextTransactionId(); - shard.tell(newBatchedModifications(transactionID1, TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME), true, false, 1), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); + final TransactionIdentifier transactionID1 = nextTransactionId(); + shard.tell(newBatchedModifications(transactionID1, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), true, false, 1), testKit.getRef()); + testKit.expectMsgClass(duration, ReadyTransactionReply.class); - final TransactionIdentifier transactionID2 = nextTransactionId(); - shard.tell(newBatchedModifications(transactionID2, TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME), true, false, 1), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); + final TransactionIdentifier transactionID2 = nextTransactionId(); + shard.tell(newBatchedModifications(transactionID2, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), true, false, 1), testKit.getRef()); + testKit.expectMsgClass(duration, ReadyTransactionReply.class); - // Send the CanCommitTransaction message for the first Tx. + // Send the CanCommitTransaction message for the first Tx. - shard.tell(new CanCommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); - final CanCommitTransactionReply canCommitReply = CanCommitTransactionReply.fromSerializable( - expectMsgClass(duration, CanCommitTransactionReply.class)); - assertEquals("Can commit", true, canCommitReply.getCanCommit()); + shard.tell(new CanCommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), testKit.getRef()); + final CanCommitTransactionReply canCommitReply = CanCommitTransactionReply + .fromSerializable(testKit.expectMsgClass(duration, CanCommitTransactionReply.class)); + assertTrue("Can commit", canCommitReply.getCanCommit()); - // Send the CanCommitTransaction message for the 2nd Tx. This should get queued and - // processed after the first Tx completes. + // Send the CanCommitTransaction message for the 2nd Tx. This + // should get queued and + // processed after the first Tx completes. - final Future canCommitFuture = Patterns.ask(shard, - new CanCommitTransaction(transactionID2, CURRENT_VERSION).toSerializable(), timeout); + final Future canCommitFuture = Patterns.ask(shard, + new CanCommitTransaction(transactionID2, CURRENT_VERSION).toSerializable(), timeout); - // Send the CommitTransaction message for the first Tx. This should send back an error - // and trigger the 2nd Tx to proceed. + // Send the CommitTransaction message for the first Tx. This + // should send back an error + // and trigger the 2nd Tx to proceed. - shard.tell(new CommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(duration, akka.actor.Status.Failure.class); + shard.tell(new CommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), testKit.getRef()); + testKit.expectMsgClass(duration, akka.actor.Status.Failure.class); - // Wait for the 2nd Tx to complete the canCommit phase. + // Wait for the 2nd Tx to complete the canCommit phase. - final CountDownLatch latch = new CountDownLatch(1); - canCommitFuture.onComplete(new OnComplete() { - @Override - public void onComplete(final Throwable t, final Object resp) { - latch.countDown(); - } - }, getSystem().dispatcher()); + final CountDownLatch latch = new CountDownLatch(1); + canCommitFuture.onComplete(new OnComplete() { + @Override + public void onComplete(final Throwable failure, final Object resp) { + latch.countDown(); + } + }, getSystem().dispatcher()); - assertEquals("2nd CanCommit complete", true, latch.await(5, TimeUnit.SECONDS)); + assertTrue("2nd CanCommit complete", latch.await(5, TimeUnit.SECONDS)); - final InOrder inOrder = inOrder(dataTree); - inOrder.verify(dataTree).validate(any(DataTreeModification.class)); - inOrder.verify(dataTree).prepare(any(DataTreeModification.class)); - inOrder.verify(dataTree).validate(any(DataTreeModification.class)); - }}; + final InOrder inOrder = inOrder(dataTree); + inOrder.verify(dataTree).validate(any(DataTreeModification.class)); + inOrder.verify(dataTree).prepare(any(DataTreeModification.class)); + inOrder.verify(dataTree).validate(any(DataTreeModification.class)); } @Test - public void testCanCommitPhaseFailure() throws Throwable { - new ShardTestKit(getSystem()) {{ - final TipProducingDataTree dataTree = createDelegatingMockDataTree(); - final TestActorRef shard = actorFactory.createTestActor( - newShardBuilder().dataTree(dataTree).props().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testCanCommitPhaseFailure"); + public void testCanCommitPhaseFailure() throws Exception { + final ShardTestKit testKit = new ShardTestKit(getSystem()); + final DataTree dataTree = createDelegatingMockDataTree(); + final TestActorRef shard = actorFactory.createTestActor( + newShardBuilder().dataTree(dataTree).props().withDispatcher(Dispatchers.DefaultDispatcherId()), + "testCanCommitPhaseFailure"); - waitUntilLeader(shard); + ShardTestKit.waitUntilLeader(shard); - final FiniteDuration duration = duration("5 seconds"); - final TransactionIdentifier transactionID1 = nextTransactionId(); + final Duration duration = Duration.ofSeconds(5); + final TransactionIdentifier transactionID1 = nextTransactionId(); - doThrow(new DataValidationFailedException(YangInstanceIdentifier.EMPTY, "mock canCommit failure")). - doNothing().when(dataTree).validate(any(DataTreeModification.class)); + doThrow(new DataValidationFailedException(YangInstanceIdentifier.EMPTY, "mock canCommit failure")) + .doNothing().when(dataTree).validate(any(DataTreeModification.class)); - shard.tell(newBatchedModifications(transactionID1, TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME), true, false, 1), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); + shard.tell(newBatchedModifications(transactionID1, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), true, false, 1), testKit.getRef()); + testKit.expectMsgClass(duration, ReadyTransactionReply.class); - // Send the CanCommitTransaction message. + // Send the CanCommitTransaction message. - shard.tell(new CanCommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(duration, akka.actor.Status.Failure.class); + shard.tell(new CanCommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), testKit.getRef()); + testKit.expectMsgClass(duration, akka.actor.Status.Failure.class); - // Send another can commit to ensure the failed one got cleaned up. + // Send another can commit to ensure the failed one got cleaned + // up. - final TransactionIdentifier transactionID2 = nextTransactionId(); - shard.tell(newBatchedModifications(transactionID2, TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME), true, false, 1), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); + final TransactionIdentifier transactionID2 = nextTransactionId(); + shard.tell(newBatchedModifications(transactionID2, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), true, false, 1), testKit.getRef()); + testKit.expectMsgClass(duration, ReadyTransactionReply.class); - shard.tell(new CanCommitTransaction(transactionID2, CURRENT_VERSION).toSerializable(), getRef()); - final CanCommitTransactionReply reply = CanCommitTransactionReply.fromSerializable( - expectMsgClass(CanCommitTransactionReply.class)); - assertEquals("getCanCommit", true, reply.getCanCommit()); - }}; + shard.tell(new CanCommitTransaction(transactionID2, CURRENT_VERSION).toSerializable(), testKit.getRef()); + final CanCommitTransactionReply reply = CanCommitTransactionReply + .fromSerializable(testKit.expectMsgClass(CanCommitTransactionReply.class)); + assertTrue("getCanCommit", reply.getCanCommit()); } @Test - public void testImmediateCommitWithCanCommitPhaseFailure() throws Throwable { + public void testImmediateCommitWithCanCommitPhaseFailure() throws Exception { testImmediateCommitWithCanCommitPhaseFailure(true); testImmediateCommitWithCanCommitPhaseFailure(false); } - private void testImmediateCommitWithCanCommitPhaseFailure(final boolean readWrite) throws Throwable { - new ShardTestKit(getSystem()) {{ - final TipProducingDataTree dataTree = createDelegatingMockDataTree(); - final TestActorRef shard = actorFactory.createTestActor( - newShardBuilder().dataTree(dataTree).props().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testImmediateCommitWithCanCommitPhaseFailure-" + readWrite); + private void testImmediateCommitWithCanCommitPhaseFailure(final boolean readWrite) throws Exception { + final ShardTestKit testKit = new ShardTestKit(getSystem()); + final DataTree dataTree = createDelegatingMockDataTree(); + final TestActorRef shard = actorFactory.createTestActor( + newShardBuilder().dataTree(dataTree).props().withDispatcher(Dispatchers.DefaultDispatcherId()), + "testImmediateCommitWithCanCommitPhaseFailure-" + readWrite); - waitUntilLeader(shard); + ShardTestKit.waitUntilLeader(shard); - doThrow(new DataValidationFailedException(YangInstanceIdentifier.EMPTY, "mock canCommit failure")). - doNothing().when(dataTree).validate(any(DataTreeModification.class)); + doThrow(new DataValidationFailedException(YangInstanceIdentifier.EMPTY, "mock canCommit failure")) + .doNothing().when(dataTree).validate(any(DataTreeModification.class)); - final FiniteDuration duration = duration("5 seconds"); + final Duration duration = Duration.ofSeconds(5); - final TransactionIdentifier transactionID1 = nextTransactionId(); + final TransactionIdentifier transactionID1 = nextTransactionId(); - if(readWrite) { - shard.tell(prepareForwardedReadyTransaction(shard, transactionID1, TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME), true), getRef()); - } else { - shard.tell(prepareBatchedModifications(transactionID1, TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME), true), getRef()); - } + if (readWrite) { + shard.tell(prepareForwardedReadyTransaction(shard, transactionID1, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), true), testKit.getRef()); + } else { + shard.tell(prepareBatchedModifications(transactionID1, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), true), testKit.getRef()); + } - expectMsgClass(duration, akka.actor.Status.Failure.class); + testKit.expectMsgClass(duration, akka.actor.Status.Failure.class); - // Send another can commit to ensure the failed one got cleaned up. + // Send another can commit to ensure the failed one got cleaned + // up. - final TransactionIdentifier transactionID2 = nextTransactionId(); - if(readWrite) { - shard.tell(prepareForwardedReadyTransaction(shard, transactionID2, TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME), true), getRef()); - } else { - shard.tell(prepareBatchedModifications(transactionID2, TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME), true), getRef()); - } + final TransactionIdentifier transactionID2 = nextTransactionId(); + if (readWrite) { + shard.tell(prepareForwardedReadyTransaction(shard, transactionID2, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), true), testKit.getRef()); + } else { + shard.tell(prepareBatchedModifications(transactionID2, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), true), testKit.getRef()); + } - expectMsgClass(duration, CommitTransactionReply.class); - }}; + testKit.expectMsgClass(duration, CommitTransactionReply.class); } - @SuppressWarnings("serial") @Test - public void testAbortWithCommitPending() throws Throwable { - new ShardTestKit(getSystem()) {{ - final Creator creator = new Creator() { - @Override - public Shard create() throws Exception { - return new Shard(newShardBuilder()) { - @Override - void persistPayload(final TransactionIdentifier transactionId, final Payload payload) { - // Simulate an AbortTransaction message occurring during replication, after - // persisting and before finishing the commit to the in-memory store. - - doAbortTransaction(transactionId, null); - super.persistPayload(transactionId, payload); - } - }; - } - }; + public void testAbortWithCommitPending() { + final ShardTestKit testKit = new ShardTestKit(getSystem()); + final Creator creator = () -> new Shard(newShardBuilder()) { + @Override + void persistPayload(final Identifier id, final Payload payload, + final boolean batchHint) { + // Simulate an AbortTransaction message occurring during + // replication, after + // persisting and before finishing the commit to the + // in-memory store. + + doAbortTransaction(id, null); + super.persistPayload(id, payload, batchHint); + } + }; - final TestActorRef shard = actorFactory.createTestActor( - Props.create(new DelegatingShardCreator(creator)).withDispatcher(Dispatchers.DefaultDispatcherId()), - "testAbortWithCommitPending"); + final TestActorRef shard = actorFactory.createTestActor(Props + .create(new DelegatingShardCreator(creator)).withDispatcher(Dispatchers.DefaultDispatcherId()), + "testAbortWithCommitPending"); - waitUntilLeader(shard); + ShardTestKit.waitUntilLeader(shard); - final FiniteDuration duration = duration("5 seconds"); + final Duration duration = Duration.ofSeconds(5); - final TransactionIdentifier transactionID = nextTransactionId(); + final TransactionIdentifier transactionID = nextTransactionId(); - shard.tell(prepareBatchedModifications(transactionID, TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME), false), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); + shard.tell(prepareBatchedModifications(transactionID, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), false), testKit.getRef()); + testKit.expectMsgClass(duration, ReadyTransactionReply.class); - shard.tell(new CanCommitTransaction(transactionID, CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(duration, CanCommitTransactionReply.class); + shard.tell(new CanCommitTransaction(transactionID, CURRENT_VERSION).toSerializable(), testKit.getRef()); + testKit.expectMsgClass(duration, CanCommitTransactionReply.class); - shard.tell(new CommitTransaction(transactionID, CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(duration, CommitTransactionReply.class); + shard.tell(new CommitTransaction(transactionID, CURRENT_VERSION).toSerializable(), testKit.getRef()); + testKit.expectMsgClass(duration, CommitTransactionReply.class); - final NormalizedNode node = readStore(shard, TestModel.TEST_PATH); + final NormalizedNode node = readStore(shard, TestModel.TEST_PATH); - // Since we're simulating an abort occurring during replication and before finish commit, - // the data should still get written to the in-memory store since we've gotten past - // canCommit and preCommit and persisted the data. - assertNotNull(TestModel.TEST_QNAME.getLocalName() + " not found", node); - }}; + // Since we're simulating an abort occurring during replication + // and before finish commit, + // the data should still get written to the in-memory store + // since we've gotten past + // canCommit and preCommit and persisted the data. + assertNotNull(TestModel.TEST_QNAME.getLocalName() + " not found", node); } @Test - public void testTransactionCommitTimeout() throws Throwable { + public void testTransactionCommitTimeout() throws Exception { dataStoreContextBuilder.shardTransactionCommitTimeoutInSeconds(1); - new ShardTestKit(getSystem()) {{ - final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testTransactionCommitTimeout"); + final ShardTestKit testKit = new ShardTestKit(getSystem()); + final TestActorRef shard = actorFactory.createTestActor( + newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), + "testTransactionCommitTimeout"); - waitUntilLeader(shard); + ShardTestKit.waitUntilLeader(shard); - final FiniteDuration duration = duration("5 seconds"); + final Duration duration = Duration.ofSeconds(5); - writeToStore(shard, TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME)); - writeToStore(shard, TestModel.OUTER_LIST_PATH, - ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build()); + writeToStore(shard, TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME)); + writeToStore(shard, TestModel.OUTER_LIST_PATH, + ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build()); - // Ready 2 Tx's - the first will timeout + // Ready 2 Tx's - the first will timeout - final TransactionIdentifier transactionID1 = nextTransactionId(); - shard.tell(prepareBatchedModifications(transactionID1, YangInstanceIdentifier.builder(TestModel.OUTER_LIST_PATH) - .nodeWithKey(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1).build(), - ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1), false), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); + final TransactionIdentifier transactionID1 = nextTransactionId(); + shard.tell( + prepareBatchedModifications(transactionID1, + YangInstanceIdentifier.builder(TestModel.OUTER_LIST_PATH) + .nodeWithKey(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1).build(), + ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1), false), + testKit.getRef()); + testKit.expectMsgClass(duration, ReadyTransactionReply.class); - final TransactionIdentifier transactionID2 = nextTransactionId(); - final YangInstanceIdentifier listNodePath = YangInstanceIdentifier.builder(TestModel.OUTER_LIST_PATH) - .nodeWithKey(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 2).build(); - shard.tell(prepareBatchedModifications(transactionID2, listNodePath, - ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 2), false), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); + final TransactionIdentifier transactionID2 = nextTransactionId(); + final YangInstanceIdentifier listNodePath = YangInstanceIdentifier.builder(TestModel.OUTER_LIST_PATH) + .nodeWithKey(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 2).build(); + shard.tell( + prepareBatchedModifications(transactionID2, listNodePath, + ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 2), false), testKit.getRef()); + testKit.expectMsgClass(duration, ReadyTransactionReply.class); - // canCommit 1st Tx. We don't send the commit so it should timeout. + // canCommit 1st Tx. We don't send the commit so it should + // timeout. - shard.tell(new CanCommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(duration, CanCommitTransactionReply.class); + shard.tell(new CanCommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), testKit.getRef()); + testKit.expectMsgClass(duration, CanCommitTransactionReply.class); - // canCommit the 2nd Tx - it should complete after the 1st Tx times out. + // canCommit the 2nd Tx - it should complete after the 1st Tx + // times out. - shard.tell(new CanCommitTransaction(transactionID2, CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(duration, CanCommitTransactionReply.class); + shard.tell(new CanCommitTransaction(transactionID2, CURRENT_VERSION).toSerializable(), testKit.getRef()); + testKit.expectMsgClass(duration, CanCommitTransactionReply.class); - // Try to commit the 1st Tx - should fail as it's not the current Tx. + // Try to commit the 1st Tx - should fail as it's not the + // current Tx. - shard.tell(new CommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(duration, akka.actor.Status.Failure.class); + shard.tell(new CommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), testKit.getRef()); + testKit.expectMsgClass(duration, akka.actor.Status.Failure.class); - // Commit the 2nd Tx. + // Commit the 2nd Tx. - shard.tell(new CommitTransaction(transactionID2, CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(duration, CommitTransactionReply.class); + shard.tell(new CommitTransaction(transactionID2, CURRENT_VERSION).toSerializable(), testKit.getRef()); + testKit.expectMsgClass(duration, CommitTransactionReply.class); - final NormalizedNode node = readStore(shard, listNodePath); - assertNotNull(listNodePath + " not found", node); - }}; + final NormalizedNode node = readStore(shard, listNodePath); + assertNotNull(listNodePath + " not found", node); } // @Test @@ -1565,15 +1390,18 @@ public class ShardTest extends AbstractShardTest { // // // Ready the Tx's // -// shard.tell(prepareReadyTransactionMessage(false, shard.underlyingActor(), cohort1, transactionID1, modification1), getRef()); +// shard.tell(prepareReadyTransactionMessage(false, shard.underlyingActor(), cohort1, transactionID1, +// modification1), getRef()); // expectMsgClass(duration, ReadyTransactionReply.class); // -// shard.tell(prepareReadyTransactionMessage(false, shard.underlyingActor(), cohort2, transactionID2, modification2), getRef()); +// shard.tell(prepareReadyTransactionMessage(false, shard.underlyingActor(), cohort2, transactionID2, +// modification2), getRef()); // expectMsgClass(duration, ReadyTransactionReply.class); // // // The 3rd Tx should exceed queue capacity and fail. // -// shard.tell(prepareReadyTransactionMessage(false, shard.underlyingActor(), cohort3, transactionID3, modification3), getRef()); +// shard.tell(prepareReadyTransactionMessage(false, shard.underlyingActor(), cohort3, transactionID3, +// modification3), getRef()); // expectMsgClass(duration, akka.actor.Status.Failure.class); // // // canCommit 1st Tx. @@ -1593,254 +1421,249 @@ public class ShardTest extends AbstractShardTest { // } @Test - public void testTransactionCommitWithPriorExpiredCohortEntries() throws Throwable { + public void testTransactionCommitWithPriorExpiredCohortEntries() { dataStoreContextBuilder.shardTransactionCommitTimeoutInSeconds(1); - new ShardTestKit(getSystem()) {{ - final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testTransactionCommitWithPriorExpiredCohortEntries"); + final ShardTestKit testKit = new ShardTestKit(getSystem()); + final TestActorRef shard = actorFactory.createTestActor( + newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), + "testTransactionCommitWithPriorExpiredCohortEntries"); - waitUntilLeader(shard); + ShardTestKit.waitUntilLeader(shard); - final FiniteDuration duration = duration("5 seconds"); + final Duration duration = Duration.ofSeconds(5); - final TransactionIdentifier transactionID1 = nextTransactionId(); - shard.tell(newBatchedModifications(transactionID1, TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME), true, false, 1), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); + final TransactionIdentifier transactionID1 = nextTransactionId(); + shard.tell(newBatchedModifications(transactionID1, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), true, false, 1), testKit.getRef()); + testKit.expectMsgClass(duration, ReadyTransactionReply.class); - final TransactionIdentifier transactionID2 = nextTransactionId(); - shard.tell(newBatchedModifications(transactionID2, TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME), true, false, 1), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); + final TransactionIdentifier transactionID2 = nextTransactionId(); + shard.tell(newBatchedModifications(transactionID2, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), true, false, 1), testKit.getRef()); + testKit.expectMsgClass(duration, ReadyTransactionReply.class); - final TransactionIdentifier transactionID3 = nextTransactionId(); - shard.tell(newBatchedModifications(transactionID3, TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME), true, false, 1), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); + final TransactionIdentifier transactionID3 = nextTransactionId(); + shard.tell(newBatchedModifications(transactionID3, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), true, false, 1), testKit.getRef()); + testKit.expectMsgClass(duration, ReadyTransactionReply.class); - // All Tx's are readied. We'll send canCommit for the last one but not the others. The others - // should expire from the queue and the last one should be processed. + // All Tx's are readied. We'll send canCommit for the last one + // but not the others. The others + // should expire from the queue and the last one should be + // processed. - shard.tell(new CanCommitTransaction(transactionID3, CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(duration, CanCommitTransactionReply.class); - }}; + shard.tell(new CanCommitTransaction(transactionID3, CURRENT_VERSION).toSerializable(), testKit.getRef()); + testKit.expectMsgClass(duration, CanCommitTransactionReply.class); } @Test - public void testTransactionCommitWithSubsequentExpiredCohortEntry() throws Throwable { + public void testTransactionCommitWithSubsequentExpiredCohortEntry() { dataStoreContextBuilder.shardTransactionCommitTimeoutInSeconds(1); - new ShardTestKit(getSystem()) {{ - final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testTransactionCommitWithSubsequentExpiredCohortEntry"); + final ShardTestKit testKit = new ShardTestKit(getSystem()); + final TestActorRef shard = actorFactory.createTestActor( + newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), + "testTransactionCommitWithSubsequentExpiredCohortEntry"); - waitUntilLeader(shard); + ShardTestKit.waitUntilLeader(shard); - final FiniteDuration duration = duration("5 seconds"); + final Duration duration = Duration.ofSeconds(5); - final ShardDataTree dataStore = shard.underlyingActor().getDataStore(); + final ShardDataTree dataStore = shard.underlyingActor().getDataStore(); - final TransactionIdentifier transactionID1 = nextTransactionId(); - shard.tell(prepareBatchedModifications(transactionID1, TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME), false), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); + final TransactionIdentifier transactionID1 = nextTransactionId(); + shard.tell(prepareBatchedModifications(transactionID1, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), false), testKit.getRef()); + testKit.expectMsgClass(duration, ReadyTransactionReply.class); - // CanCommit the first Tx so it's the current in-progress Tx. + // CanCommit the first Tx so it's the current in-progress Tx. - shard.tell(new CanCommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(duration, CanCommitTransactionReply.class); + shard.tell(new CanCommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), testKit.getRef()); + testKit.expectMsgClass(duration, CanCommitTransactionReply.class); - // Ready the second Tx. + // Ready the second Tx. - final TransactionIdentifier transactionID2 = nextTransactionId(); - shard.tell(prepareBatchedModifications(transactionID2, TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME), false), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); + final TransactionIdentifier transactionID2 = nextTransactionId(); + shard.tell(prepareBatchedModifications(transactionID2, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), false), testKit.getRef()); + testKit.expectMsgClass(duration, ReadyTransactionReply.class); - // Ready the third Tx. + // Ready the third Tx. - final TransactionIdentifier transactionID3 = nextTransactionId(); - final DataTreeModification modification3 = dataStore.newModification(); - new WriteModification(TestModel.TEST2_PATH, ImmutableNodes.containerNode(TestModel.TEST2_QNAME)) - .apply(modification3); - modification3.ready(); - final ReadyLocalTransaction readyMessage = new ReadyLocalTransaction(transactionID3, modification3, true); - shard.tell(readyMessage, getRef()); + final TransactionIdentifier transactionID3 = nextTransactionId(); + final DataTreeModification modification3 = dataStore.newModification(); + new WriteModification(TestModel.TEST2_PATH, ImmutableNodes.containerNode(TestModel.TEST2_QNAME)) + .apply(modification3); + modification3.ready(); + final ReadyLocalTransaction readyMessage = new ReadyLocalTransaction(transactionID3, modification3, + true, Optional.empty()); + shard.tell(readyMessage, testKit.getRef()); - // Commit the first Tx. After completing, the second should expire from the queue and the third - // Tx committed. + // Commit the first Tx. After completing, the second should + // expire from the queue and the third + // Tx committed. - shard.tell(new CommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(duration, CommitTransactionReply.class); + shard.tell(new CommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), testKit.getRef()); + testKit.expectMsgClass(duration, CommitTransactionReply.class); - // Expect commit reply from the third Tx. + // Expect commit reply from the third Tx. - expectMsgClass(duration, CommitTransactionReply.class); + testKit.expectMsgClass(duration, CommitTransactionReply.class); - final NormalizedNode node = readStore(shard, TestModel.TEST2_PATH); - assertNotNull(TestModel.TEST2_PATH + " not found", node); - }}; + final NormalizedNode node = readStore(shard, TestModel.TEST2_PATH); + assertNotNull(TestModel.TEST2_PATH + " not found", node); } @Test - public void testCanCommitBeforeReadyFailure() throws Throwable { - new ShardTestKit(getSystem()) {{ - final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testCanCommitBeforeReadyFailure"); - - shard.tell(new CanCommitTransaction(nextTransactionId(), CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(duration("5 seconds"), akka.actor.Status.Failure.class); - }}; + public void testCanCommitBeforeReadyFailure() { + final ShardTestKit testKit = new ShardTestKit(getSystem()); + final TestActorRef shard = actorFactory.createTestActor( + newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), + "testCanCommitBeforeReadyFailure"); + + shard.tell(new CanCommitTransaction(nextTransactionId(), CURRENT_VERSION).toSerializable(), testKit.getRef()); + testKit.expectMsgClass(Duration.ofSeconds(5), akka.actor.Status.Failure.class); } @Test - public void testAbortAfterCanCommit() throws Throwable { - new ShardTestKit(getSystem()) {{ - final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testAbortAfterCanCommit"); + public void testAbortAfterCanCommit() throws Exception { + final ShardTestKit testKit = new ShardTestKit(getSystem()); + final TestActorRef shard = actorFactory.createTestActor( + newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), "testAbortAfterCanCommit"); - waitUntilLeader(shard); + ShardTestKit.waitUntilLeader(shard); - final FiniteDuration duration = duration("5 seconds"); - final Timeout timeout = new Timeout(duration); + final Duration duration = Duration.ofSeconds(5); + final Timeout timeout = Timeout.create(duration); - // Ready 2 transactions - the first one will be aborted. + // Ready 2 transactions - the first one will be aborted. - final TransactionIdentifier transactionID1 = nextTransactionId(); - shard.tell(newBatchedModifications(transactionID1, TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME), true, false, 1), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); + final TransactionIdentifier transactionID1 = nextTransactionId(); + shard.tell(newBatchedModifications(transactionID1, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), true, false, 1), testKit.getRef()); + testKit.expectMsgClass(duration, ReadyTransactionReply.class); - final TransactionIdentifier transactionID2 = nextTransactionId(); - shard.tell(newBatchedModifications(transactionID2, TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME), true, false, 1), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); + final TransactionIdentifier transactionID2 = nextTransactionId(); + shard.tell(newBatchedModifications(transactionID2, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), true, false, 1), testKit.getRef()); + testKit.expectMsgClass(duration, ReadyTransactionReply.class); - // Send the CanCommitTransaction message for the first Tx. + // Send the CanCommitTransaction message for the first Tx. - shard.tell(new CanCommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); - CanCommitTransactionReply canCommitReply = CanCommitTransactionReply.fromSerializable( - expectMsgClass(duration, CanCommitTransactionReply.class)); - assertEquals("Can commit", true, canCommitReply.getCanCommit()); + shard.tell(new CanCommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), testKit.getRef()); + CanCommitTransactionReply canCommitReply = CanCommitTransactionReply + .fromSerializable(testKit.expectMsgClass(duration, CanCommitTransactionReply.class)); + assertTrue("Can commit", canCommitReply.getCanCommit()); - // Send the CanCommitTransaction message for the 2nd Tx. This should get queued and - // processed after the first Tx completes. + // Send the CanCommitTransaction message for the 2nd Tx. This + // should get queued and + // processed after the first Tx completes. - final Future canCommitFuture = Patterns.ask(shard, - new CanCommitTransaction(transactionID2, CURRENT_VERSION).toSerializable(), timeout); + final Future canCommitFuture = Patterns.ask(shard, + new CanCommitTransaction(transactionID2, CURRENT_VERSION).toSerializable(), timeout); - // Send the AbortTransaction message for the first Tx. This should trigger the 2nd - // Tx to proceed. + // Send the AbortTransaction message for the first Tx. This + // should trigger the 2nd + // Tx to proceed. - shard.tell(new AbortTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(duration, AbortTransactionReply.class); + shard.tell(new AbortTransaction(transactionID1, CURRENT_VERSION).toSerializable(), testKit.getRef()); + testKit.expectMsgClass(duration, AbortTransactionReply.class); - // Wait for the 2nd Tx to complete the canCommit phase. + // Wait for the 2nd Tx to complete the canCommit phase. - canCommitReply = (CanCommitTransactionReply) Await.result(canCommitFuture, duration); - assertEquals("Can commit", true, canCommitReply.getCanCommit()); - }}; + canCommitReply = (CanCommitTransactionReply) Await.result(canCommitFuture, + FiniteDuration.create(5, TimeUnit.SECONDS)); + assertTrue("Can commit", canCommitReply.getCanCommit()); } @Test - public void testAbortAfterReady() throws Throwable { + public void testAbortAfterReady() { dataStoreContextBuilder.shardTransactionCommitTimeoutInSeconds(1); - new ShardTestKit(getSystem()) {{ - final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), "testAbortAfterReady"); + final ShardTestKit testKit = new ShardTestKit(getSystem()); + final TestActorRef shard = actorFactory.createTestActor( + newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), "testAbortAfterReady"); - waitUntilLeader(shard); + ShardTestKit.waitUntilLeader(shard); - final FiniteDuration duration = duration("5 seconds"); + final Duration duration = Duration.ofSeconds(5); - // Ready a tx. + // Ready a tx. - final TransactionIdentifier transactionID1 = nextTransactionId(); - shard.tell(newBatchedModifications(transactionID1, TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME), true, false, 1), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); + final TransactionIdentifier transactionID1 = nextTransactionId(); + shard.tell(newBatchedModifications(transactionID1, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), true, false, 1), testKit.getRef()); + testKit.expectMsgClass(duration, ReadyTransactionReply.class); - // Send the AbortTransaction message. + // Send the AbortTransaction message. - shard.tell(new AbortTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(duration, AbortTransactionReply.class); + shard.tell(new AbortTransaction(transactionID1, CURRENT_VERSION).toSerializable(), testKit.getRef()); + testKit.expectMsgClass(duration, AbortTransactionReply.class); - assertEquals("getPendingTxCommitQueueSize", 0, shard.underlyingActor().getPendingTxCommitQueueSize()); + assertEquals("getPendingTxCommitQueueSize", 0, shard.underlyingActor().getPendingTxCommitQueueSize()); - // Now send CanCommitTransaction - should fail. + // Now send CanCommitTransaction - should fail. - shard.tell(new CanCommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); - final Throwable failure = expectMsgClass(duration, akka.actor.Status.Failure.class).cause(); - assertTrue("Failure type", failure instanceof IllegalStateException); + shard.tell(new CanCommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), testKit.getRef()); + final Throwable failure = testKit.expectMsgClass(duration, akka.actor.Status.Failure.class).cause(); + assertTrue("Failure type", failure instanceof IllegalStateException); - // Ready and CanCommit another and verify success. + // Ready and CanCommit another and verify success. - final TransactionIdentifier transactionID2 = nextTransactionId(); - shard.tell(newBatchedModifications(transactionID2, TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME), true, false, 1), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); + final TransactionIdentifier transactionID2 = nextTransactionId(); + shard.tell(newBatchedModifications(transactionID2, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), true, false, 1), testKit.getRef()); + testKit.expectMsgClass(duration, ReadyTransactionReply.class); - shard.tell(new CanCommitTransaction(transactionID2, CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(duration, CanCommitTransactionReply.class); - }}; + shard.tell(new CanCommitTransaction(transactionID2, CURRENT_VERSION).toSerializable(), testKit.getRef()); + testKit.expectMsgClass(duration, CanCommitTransactionReply.class); } @Test - public void testAbortQueuedTransaction() throws Throwable { - new ShardTestKit(getSystem()) {{ - final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), "testAbortAfterReady"); + public void testAbortQueuedTransaction() { + final ShardTestKit testKit = new ShardTestKit(getSystem()); + final TestActorRef shard = actorFactory.createTestActor( + newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), "testAbortAfterReady"); - waitUntilLeader(shard); + ShardTestKit.waitUntilLeader(shard); - final FiniteDuration duration = duration("5 seconds"); + final Duration duration = Duration.ofSeconds(5); - // Ready 3 tx's. + // Ready 3 tx's. - final TransactionIdentifier transactionID1 = nextTransactionId(); - shard.tell(newBatchedModifications(transactionID1, TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME), true, false, 1), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); + final TransactionIdentifier transactionID1 = nextTransactionId(); + shard.tell(newBatchedModifications(transactionID1, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), true, false, 1), testKit.getRef()); + testKit.expectMsgClass(duration, ReadyTransactionReply.class); - final TransactionIdentifier transactionID2 = nextTransactionId(); - shard.tell(newBatchedModifications(transactionID2, TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME), true, false, 1), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); + final TransactionIdentifier transactionID2 = nextTransactionId(); + shard.tell(newBatchedModifications(transactionID2, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), true, false, 1), testKit.getRef()); + testKit.expectMsgClass(duration, ReadyTransactionReply.class); - final TransactionIdentifier transactionID3 = nextTransactionId(); - shard.tell(newBatchedModifications(transactionID3, TestModel.OUTER_LIST_PATH, - ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build(), true, false, 1), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); + final TransactionIdentifier transactionID3 = nextTransactionId(); + shard.tell(newBatchedModifications(transactionID3, TestModel.OUTER_LIST_PATH, + ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build(), true, false, 1), testKit.getRef()); + testKit.expectMsgClass(duration, ReadyTransactionReply.class); - // Abort the second tx while it's queued. + // Abort the second tx while it's queued. - shard.tell(new AbortTransaction(transactionID2, CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(duration, AbortTransactionReply.class); + shard.tell(new AbortTransaction(transactionID2, CURRENT_VERSION).toSerializable(), testKit.getRef()); + testKit.expectMsgClass(duration, AbortTransactionReply.class); - // Commit the other 2. + // Commit the other 2. - shard.tell(new CanCommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(duration, CanCommitTransactionReply.class); + shard.tell(new CanCommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), testKit.getRef()); + testKit.expectMsgClass(duration, CanCommitTransactionReply.class); - shard.tell(new CommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(duration, CommitTransactionReply.class); + shard.tell(new CommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), testKit.getRef()); + testKit.expectMsgClass(duration, CommitTransactionReply.class); - shard.tell(new CanCommitTransaction(transactionID3, CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(duration, CanCommitTransactionReply.class); + shard.tell(new CanCommitTransaction(transactionID3, CURRENT_VERSION).toSerializable(), testKit.getRef()); + testKit.expectMsgClass(duration, CanCommitTransactionReply.class); - shard.tell(new CommitTransaction(transactionID3, CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(duration, CommitTransactionReply.class); + shard.tell(new CommitTransaction(transactionID3, CURRENT_VERSION).toSerializable(), testKit.getRef()); + testKit.expectMsgClass(duration, CommitTransactionReply.class); - assertEquals("getPendingTxCommitQueueSize", 0, shard.underlyingActor().getPendingTxCommitQueueSize()); - }}; - } - - @Test - public void testCreateSnapshot() throws Exception { - testCreateSnapshot(true, "testCreateSnapshot"); + assertEquals("getPendingTxCommitQueueSize", 0, shard.underlyingActor().getPendingTxCommitQueueSize()); } @Test @@ -1848,8 +1671,12 @@ public class ShardTest extends AbstractShardTest { testCreateSnapshot(false, "testCreateSnapshotWithNonPersistentData"); } - private void testCreateSnapshot(final boolean persistent, final String shardActorName) throws Exception{ + @Test + public void testCreateSnapshot() throws Exception { + testCreateSnapshot(true, "testCreateSnapshot"); + } + private void testCreateSnapshot(final boolean persistent, final String shardActorName) throws Exception { final AtomicReference latch = new AtomicReference<>(new CountDownLatch(1)); final AtomicReference savedSnapshot = new AtomicReference<>(); @@ -1859,85 +1686,82 @@ public class ShardTest extends AbstractShardTest { } @Override - public void saveSnapshot(final Object o) { - savedSnapshot.set(o); - super.saveSnapshot(o); + public void saveSnapshot(final Object obj) { + savedSnapshot.set(obj); + super.saveSnapshot(obj); } } dataStoreContextBuilder.persistent(persistent); - new ShardTestKit(getSystem()) {{ - class TestShard extends Shard { + class TestShard extends Shard { - protected TestShard(final AbstractBuilder builder) { - super(builder); - setPersistence(new TestPersistentDataProvider(super.persistence())); - } + protected TestShard(final AbstractBuilder builder) { + super(builder); + setPersistence(new TestPersistentDataProvider(super.persistence())); + } - @Override - public void handleCommand(final Object message) { - super.handleCommand(message); + @Override + public void handleCommand(final Object message) { + super.handleCommand(message); - // XXX: commit_snapshot equality check references RaftActorSnapshotMessageSupport.COMMIT_SNAPSHOT - if (message instanceof SaveSnapshotSuccess || "commit_snapshot".equals(message.toString())) { - latch.get().countDown(); - } + // XXX: commit_snapshot equality check references RaftActorSnapshotMessageSupport.COMMIT_SNAPSHOT + if (message instanceof SaveSnapshotSuccess || "commit_snapshot".equals(message.toString())) { + latch.get().countDown(); } + } - @Override - public RaftActorContext getRaftActorContext() { - return super.getRaftActorContext(); - } + @Override + public RaftActorContext getRaftActorContext() { + return super.getRaftActorContext(); } + } - final Creator creator = () -> new TestShard(newShardBuilder()); + final Creator creator = () -> new TestShard(newShardBuilder()); - final TestActorRef shard = actorFactory.createTestActor( - Props.create(new DelegatingShardCreator(creator)). - withDispatcher(Dispatchers.DefaultDispatcherId()), shardActorName); + final TestActorRef shard = actorFactory.createTestActor(Props + .create(new DelegatingShardCreator(creator)).withDispatcher(Dispatchers.DefaultDispatcherId()), + shardActorName); - waitUntilLeader(shard); - writeToStore(shard, TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME)); + ShardTestKit.waitUntilLeader(shard); + writeToStore(shard, TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME)); - final NormalizedNode expectedRoot = readStore(shard, YangInstanceIdentifier.EMPTY); + final NormalizedNode expectedRoot = readStore(shard, YangInstanceIdentifier.EMPTY); - // Trigger creation of a snapshot by ensuring - final RaftActorContext raftActorContext = ((TestShard) shard.underlyingActor()).getRaftActorContext(); - raftActorContext.getSnapshotManager().capture(mock(ReplicatedLogEntry.class), -1); - awaitAndValidateSnapshot(expectedRoot); + // Trigger creation of a snapshot by ensuring + final RaftActorContext raftActorContext = ((TestShard) shard.underlyingActor()).getRaftActorContext(); + raftActorContext.getSnapshotManager().capture(mock(ReplicatedLogEntry.class), -1); + awaitAndValidateSnapshot(latch, savedSnapshot, expectedRoot); - raftActorContext.getSnapshotManager().capture(mock(ReplicatedLogEntry.class), -1); - awaitAndValidateSnapshot(expectedRoot); - } + raftActorContext.getSnapshotManager().capture(mock(ReplicatedLogEntry.class), -1); + awaitAndValidateSnapshot(latch, savedSnapshot, expectedRoot); + } - private void awaitAndValidateSnapshot(final NormalizedNode expectedRoot) throws InterruptedException, IOException { - assertEquals("Snapshot saved", true, latch.get().await(5, TimeUnit.SECONDS)); + private static void awaitAndValidateSnapshot(final AtomicReference latch, + final AtomicReference savedSnapshot, final NormalizedNode expectedRoot) + throws InterruptedException { + assertTrue("Snapshot saved", latch.get().await(5, TimeUnit.SECONDS)); - assertTrue("Invalid saved snapshot " + savedSnapshot.get(), - savedSnapshot.get() instanceof Snapshot); + assertTrue("Invalid saved snapshot " + savedSnapshot.get(), savedSnapshot.get() instanceof Snapshot); - verifySnapshot((Snapshot)savedSnapshot.get(), expectedRoot); + verifySnapshot((Snapshot) savedSnapshot.get(), expectedRoot); - latch.set(new CountDownLatch(1)); - savedSnapshot.set(null); - } + latch.set(new CountDownLatch(1)); + savedSnapshot.set(null); + } - private void verifySnapshot(final Snapshot snapshot, final NormalizedNode expectedRoot) throws IOException { - final NormalizedNode actual = ShardDataTreeSnapshot.deserialize(snapshot.getState()).getRootNode().get(); - assertEquals("Root node", expectedRoot, actual); - }}; + private static void verifySnapshot(final Snapshot snapshot, final NormalizedNode expectedRoot) { + final NormalizedNode actual = ((ShardSnapshotState)snapshot.getState()).getSnapshot().getRootNode().get(); + assertEquals("Root node", expectedRoot, actual); } /** - * This test simply verifies that the applySnapShot logic will work - * @throws ReadFailedException - * @throws DataValidationFailedException + * This test simply verifies that the applySnapShot logic will work. */ @Test - public void testInMemoryDataTreeRestore() throws ReadFailedException, DataValidationFailedException { - final DataTree store = InMemoryDataTreeFactory.getInstance().create(TreeType.OPERATIONAL); - store.setSchemaContext(SCHEMA_CONTEXT); + public void testInMemoryDataTreeRestore() throws DataValidationFailedException { + final DataTree store = new InMemoryDataTreeFactory().create(DataTreeConfiguration.DEFAULT_OPERATIONAL, + SCHEMA_CONTEXT); final DataTreeModification putTransaction = store.takeSnapshot().newModification(); putTransaction.write(TestModel.TEST_PATH, @@ -1960,261 +1784,208 @@ public class ShardTest extends AbstractShardTest { } @Test - public void testRecoveryApplicable(){ + public void testRecoveryApplicable() { - final DatastoreContext persistentContext = DatastoreContext.newBuilder(). - shardJournalRecoveryLogBatchSize(3).shardSnapshotBatchCount(5000).persistent(true).build(); + final DatastoreContext persistentContext = DatastoreContext.newBuilder() + .shardJournalRecoveryLogBatchSize(3).shardSnapshotBatchCount(5000).persistent(true).build(); - final Props persistentProps = Shard.builder().id(shardID).datastoreContext(persistentContext). - schemaContext(SCHEMA_CONTEXT).props(); + final Props persistentProps = Shard.builder().id(shardID).datastoreContext(persistentContext) + .schemaContextProvider(() -> SCHEMA_CONTEXT).props(); - final DatastoreContext nonPersistentContext = DatastoreContext.newBuilder(). - shardJournalRecoveryLogBatchSize(3).shardSnapshotBatchCount(5000).persistent(false).build(); + final DatastoreContext nonPersistentContext = DatastoreContext.newBuilder() + .shardJournalRecoveryLogBatchSize(3).shardSnapshotBatchCount(5000).persistent(false).build(); - final Props nonPersistentProps = Shard.builder().id(shardID).datastoreContext(nonPersistentContext). - schemaContext(SCHEMA_CONTEXT).props(); + final Props nonPersistentProps = Shard.builder().id(shardID).datastoreContext(nonPersistentContext) + .schemaContextProvider(() -> SCHEMA_CONTEXT).props(); - new ShardTestKit(getSystem()) {{ - final TestActorRef shard1 = actorFactory.createTestActor(persistentProps, "testPersistence1"); + final TestActorRef shard1 = actorFactory.createTestActor(persistentProps, "testPersistence1"); - assertTrue("Recovery Applicable", shard1.underlyingActor().persistence().isRecoveryApplicable()); + assertTrue("Recovery Applicable", shard1.underlyingActor().persistence().isRecoveryApplicable()); - final TestActorRef shard2 = actorFactory.createTestActor(nonPersistentProps, "testPersistence2"); + final TestActorRef shard2 = actorFactory.createTestActor(nonPersistentProps, "testPersistence2"); - assertFalse("Recovery Not Applicable", shard2.underlyingActor().persistence().isRecoveryApplicable()); - }}; + assertFalse("Recovery Not Applicable", shard2.underlyingActor().persistence().isRecoveryApplicable()); } @Test public void testOnDatastoreContext() { - new ShardTestKit(getSystem()) {{ - dataStoreContextBuilder.persistent(true); + dataStoreContextBuilder.persistent(true); - final TestActorRef shard = actorFactory.createTestActor(newShardProps(), "testOnDatastoreContext"); + final TestActorRef shard = actorFactory.createTestActor(newShardProps(), "testOnDatastoreContext"); - assertEquals("isRecoveryApplicable", true, - shard.underlyingActor().persistence().isRecoveryApplicable()); + assertTrue("isRecoveryApplicable", shard.underlyingActor().persistence().isRecoveryApplicable()); - waitUntilLeader(shard); + ShardTestKit.waitUntilLeader(shard); - shard.tell(dataStoreContextBuilder.persistent(false).build(), ActorRef.noSender()); + shard.tell(dataStoreContextBuilder.persistent(false).build(), ActorRef.noSender()); - assertEquals("isRecoveryApplicable", false, - shard.underlyingActor().persistence().isRecoveryApplicable()); + assertFalse("isRecoveryApplicable", shard.underlyingActor().persistence().isRecoveryApplicable()); - shard.tell(dataStoreContextBuilder.persistent(true).build(), ActorRef.noSender()); + shard.tell(dataStoreContextBuilder.persistent(true).build(), ActorRef.noSender()); - assertEquals("isRecoveryApplicable", true, - shard.underlyingActor().persistence().isRecoveryApplicable()); - }}; + assertTrue("isRecoveryApplicable", shard.underlyingActor().persistence().isRecoveryApplicable()); } @Test - public void testRegisterRoleChangeListener() throws Exception { - new ShardTestKit(getSystem()) { - { - final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testRegisterRoleChangeListener"); + public void testRegisterRoleChangeListener() { + final ShardTestKit testKit = new ShardTestKit(getSystem()); + final TestActorRef shard = actorFactory.createTestActor( + newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), + "testRegisterRoleChangeListener"); - waitUntilLeader(shard); + ShardTestKit.waitUntilLeader(shard); - final TestActorRef listener = - TestActorRef.create(getSystem(), Props.create(MessageCollectorActor.class)); + final ActorRef listener = getSystem().actorOf(MessageCollectorActor.props()); - shard.tell(new RegisterRoleChangeListener(), listener); + shard.tell(new RegisterRoleChangeListener(), listener); - MessageCollectorActor.expectFirstMatching(listener, RegisterRoleChangeListenerReply.class); + MessageCollectorActor.expectFirstMatching(listener, RegisterRoleChangeListenerReply.class); - ShardLeaderStateChanged leaderStateChanged = MessageCollectorActor.expectFirstMatching(listener, - ShardLeaderStateChanged.class); - assertEquals("getLocalShardDataTree present", true, - leaderStateChanged.getLocalShardDataTree().isPresent()); - assertSame("getLocalShardDataTree", shard.underlyingActor().getDataStore().getDataTree(), - leaderStateChanged.getLocalShardDataTree().get()); + ShardLeaderStateChanged leaderStateChanged = MessageCollectorActor.expectFirstMatching(listener, + ShardLeaderStateChanged.class); + assertTrue("getLocalShardDataTree present", leaderStateChanged.getLocalShardDataTree().isPresent()); + assertSame("getLocalShardDataTree", shard.underlyingActor().getDataStore().getDataTree(), + leaderStateChanged.getLocalShardDataTree().get()); - MessageCollectorActor.clearMessages(listener); + MessageCollectorActor.clearMessages(listener); - // Force a leader change + // Force a leader change - shard.tell(new RequestVote(10000, "member2", 50, 50), getRef()); + shard.tell(new RequestVote(10000, "member2", 50, 50), testKit.getRef()); - leaderStateChanged = MessageCollectorActor.expectFirstMatching(listener, - ShardLeaderStateChanged.class); - assertEquals("getLocalShardDataTree present", false, - leaderStateChanged.getLocalShardDataTree().isPresent()); - } - }; + leaderStateChanged = MessageCollectorActor.expectFirstMatching(listener, ShardLeaderStateChanged.class); + assertFalse("getLocalShardDataTree present", leaderStateChanged.getLocalShardDataTree().isPresent()); } @Test - public void testFollowerInitialSyncStatus() throws Exception { + public void testFollowerInitialSyncStatus() { final TestActorRef shard = actorFactory.createTestActor( newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), "testFollowerInitialSyncStatus"); - shard.underlyingActor().handleNonRaftCommand(new FollowerInitialSyncUpStatus(false, "member-1-shard-inventory-operational")); + shard.underlyingActor().handleNonRaftCommand(new FollowerInitialSyncUpStatus(false, + "member-1-shard-inventory-operational")); - assertEquals(false, shard.underlyingActor().getShardMBean().getFollowerInitialSyncStatus()); + assertFalse(shard.underlyingActor().getShardMBean().getFollowerInitialSyncStatus()); - shard.underlyingActor().handleNonRaftCommand(new FollowerInitialSyncUpStatus(true, "member-1-shard-inventory-operational")); + shard.underlyingActor().handleNonRaftCommand(new FollowerInitialSyncUpStatus(true, + "member-1-shard-inventory-operational")); - assertEquals(true, shard.underlyingActor().getShardMBean().getFollowerInitialSyncStatus()); + assertTrue(shard.underlyingActor().getShardMBean().getFollowerInitialSyncStatus()); } @Test - public void testClusteredDataChangeListenerDelayedRegistration() throws Exception { - new ShardTestKit(getSystem()) {{ - final String testName = "testClusteredDataChangeListenerDelayedRegistration"; - dataStoreContextBuilder.shardElectionTimeoutFactor(1000). - customRaftPolicyImplementation(DisableElectionsRaftPolicy.class.getName()); + public void testClusteredDataTreeChangeListenerWithDelayedRegistration() throws Exception { + final ShardTestKit testKit = new ShardTestKit(getSystem()); + final String testName = "testClusteredDataTreeChangeListenerWithDelayedRegistration"; + dataStoreContextBuilder.shardElectionTimeoutFactor(1000) + .customRaftPolicyImplementation(DisableElectionsRaftPolicy.class.getName()); - final MockDataChangeListener listener = new MockDataChangeListener(1); - final ActorRef dclActor = actorFactory.createActor(DataChangeListener.props(listener), - actorFactory.generateActorId(testName + "-DataChangeListener")); + final MockDataTreeChangeListener listener = new MockDataTreeChangeListener(1); + final ActorRef dclActor = actorFactory.createActor(DataTreeChangeListenerActor.props(listener, + TestModel.TEST_PATH), actorFactory.generateActorId(testName + "-DataTreeChangeListener")); - setupInMemorySnapshotStore(); + setupInMemorySnapshotStore(); - final TestActorRef shard = actorFactory.createTestActor( - newShardBuilder().props().withDispatcher(Dispatchers.DefaultDispatcherId()), - actorFactory.generateActorId(testName + "-shard")); - - waitUntilNoLeader(shard); + final TestActorRef shard = actorFactory.createTestActor( + newShardBuilder().props().withDispatcher(Dispatchers.DefaultDispatcherId()), + actorFactory.generateActorId(testName + "-shard")); - final YangInstanceIdentifier path = TestModel.TEST_PATH; + testKit.waitUntilNoLeader(shard); - shard.tell(new RegisterChangeListener(path, dclActor, AsyncDataBroker.DataChangeScope.BASE, true), getRef()); - final RegisterChangeListenerReply reply = expectMsgClass(duration("5 seconds"), - RegisterChangeListenerReply.class); - assertNotNull("getListenerRegistrationPath", reply.getListenerRegistrationPath()); + shard.tell(new RegisterDataTreeChangeListener(TestModel.TEST_PATH, dclActor, true), testKit.getRef()); + final RegisterDataTreeNotificationListenerReply reply = testKit.expectMsgClass(Duration.ofSeconds(5), + RegisterDataTreeNotificationListenerReply.class); + assertNotNull("getListenerRegistrationPath", reply.getListenerRegistrationPath()); - shard.tell(DatastoreContext.newBuilderFrom(dataStoreContextBuilder.build()). - customRaftPolicyImplementation(null).build(), ActorRef.noSender()); + shard.tell(DatastoreContext.newBuilderFrom(dataStoreContextBuilder.build()) + .customRaftPolicyImplementation(null).build(), ActorRef.noSender()); - listener.waitForChangeEvents(); - }}; + listener.waitForChangeEvents(); } @Test - public void testClusteredDataChangeListenerRegistration() throws Exception { - new ShardTestKit(getSystem()) {{ - final String testName = "testClusteredDataChangeListenerRegistration"; - final ShardIdentifier followerShardID = ShardIdentifier.create("inventory", - MemberName.forName(actorFactory.generateActorId(testName + "-follower")), "config"); - - final ShardIdentifier leaderShardID = ShardIdentifier.create("inventory", - MemberName.forName(actorFactory.generateActorId(testName + "-leader")), "config"); - - final TestActorRef followerShard = actorFactory.createTestActor( - Shard.builder().id(followerShardID). - datastoreContext(dataStoreContextBuilder.shardElectionTimeoutFactor(1000).build()). - peerAddresses(Collections.singletonMap(leaderShardID.toString(), - "akka://test/user/" + leaderShardID.toString())).schemaContext(SCHEMA_CONTEXT).props(). - withDispatcher(Dispatchers.DefaultDispatcherId()), followerShardID.toString()); - - final TestActorRef leaderShard = actorFactory.createTestActor( - Shard.builder().id(leaderShardID).datastoreContext(newDatastoreContext()). - peerAddresses(Collections.singletonMap(followerShardID.toString(), - "akka://test/user/" + followerShardID.toString())).schemaContext(SCHEMA_CONTEXT).props(). - withDispatcher(Dispatchers.DefaultDispatcherId()), leaderShardID.toString()); - - leaderShard.tell(TimeoutNow.INSTANCE, ActorRef.noSender()); - final String leaderPath = waitUntilLeader(followerShard); - assertEquals("Shard leader path", leaderShard.path().toString(), leaderPath); - - final YangInstanceIdentifier path = TestModel.TEST_PATH; - final MockDataChangeListener listener = new MockDataChangeListener(1); - final ActorRef dclActor = actorFactory.createActor(DataChangeListener.props(listener), - actorFactory.generateActorId(testName + "-DataChangeListener")); - - followerShard.tell(new RegisterChangeListener(path, dclActor, AsyncDataBroker.DataChangeScope.BASE, true), getRef()); - final RegisterChangeListenerReply reply = expectMsgClass(duration("5 seconds"), - RegisterChangeListenerReply.class); - assertNotNull("getListenerRegistratioznPath", reply.getListenerRegistrationPath()); - - writeToStore(followerShard, path, ImmutableNodes.containerNode(TestModel.TEST_QNAME)); - - listener.waitForChangeEvents(); - }}; - } + public void testClusteredDataTreeChangeListenerWithDelayedRegistrationClosed() throws Exception { + final ShardTestKit testKit = new ShardTestKit(getSystem()); + final String testName = "testClusteredDataTreeChangeListenerWithDelayedRegistrationClosed"; + dataStoreContextBuilder.shardElectionTimeoutFactor(1000) + .customRaftPolicyImplementation(DisableElectionsRaftPolicy.class.getName()); - @Test - public void testClusteredDataTreeChangeListenerDelayedRegistration() throws Exception { - new ShardTestKit(getSystem()) {{ - final String testName = "testClusteredDataTreeChangeListenerDelayedRegistration"; - dataStoreContextBuilder.shardElectionTimeoutFactor(1000). - customRaftPolicyImplementation(DisableElectionsRaftPolicy.class.getName()); + final MockDataTreeChangeListener listener = new MockDataTreeChangeListener(0); + final ActorRef dclActor = actorFactory.createActor(DataTreeChangeListenerActor.props(listener, + TestModel.TEST_PATH), actorFactory.generateActorId(testName + "-DataTreeChangeListener")); - final MockDataTreeChangeListener listener = new MockDataTreeChangeListener(1); - final ActorRef dclActor = actorFactory.createActor(DataTreeChangeListenerActor.props(listener), - actorFactory.generateActorId(testName + "-DataTreeChangeListener")); + setupInMemorySnapshotStore(); - setupInMemorySnapshotStore(); + final TestActorRef shard = actorFactory.createTestActor( + newShardBuilder().props().withDispatcher(Dispatchers.DefaultDispatcherId()), + actorFactory.generateActorId(testName + "-shard")); - final TestActorRef shard = actorFactory.createTestActor( - newShardBuilder().props().withDispatcher(Dispatchers.DefaultDispatcherId()), - actorFactory.generateActorId(testName + "-shard")); + testKit.waitUntilNoLeader(shard); - waitUntilNoLeader(shard); + shard.tell(new RegisterDataTreeChangeListener(TestModel.TEST_PATH, dclActor, true), testKit.getRef()); + final RegisterDataTreeNotificationListenerReply reply = testKit.expectMsgClass(Duration.ofSeconds(5), + RegisterDataTreeNotificationListenerReply.class); + assertNotNull("getListenerRegistrationPath", reply.getListenerRegistrationPath()); - shard.tell(new RegisterDataTreeChangeListener(TestModel.TEST_PATH, dclActor, true), getRef()); - final RegisterDataTreeChangeListenerReply reply = expectMsgClass(duration("5 seconds"), - RegisterDataTreeChangeListenerReply.class); - assertNotNull("getListenerRegistrationPath", reply.getListenerRegistrationPath()); + final ActorSelection regActor = getSystem().actorSelection(reply.getListenerRegistrationPath()); + regActor.tell(CloseDataTreeNotificationListenerRegistration.getInstance(), testKit.getRef()); + testKit.expectMsgClass(CloseDataTreeNotificationListenerRegistrationReply.class); - shard.tell(DatastoreContext.newBuilderFrom(dataStoreContextBuilder.build()). - customRaftPolicyImplementation(null).build(), ActorRef.noSender()); + shard.tell(DatastoreContext.newBuilderFrom(dataStoreContextBuilder.build()) + .customRaftPolicyImplementation(null).build(), ActorRef.noSender()); - listener.waitForChangeEvents(); - }}; + listener.expectNoMoreChanges("Received unexpected change after close"); } @Test public void testClusteredDataTreeChangeListenerRegistration() throws Exception { - new ShardTestKit(getSystem()) {{ - final String testName = "testClusteredDataTreeChangeListenerRegistration"; - final ShardIdentifier followerShardID = ShardIdentifier.create("inventory", - MemberName.forName(actorFactory.generateActorId(testName + "-follower")), "config"); - - final ShardIdentifier leaderShardID = ShardIdentifier.create("inventory", - MemberName.forName(actorFactory.generateActorId(testName + "-leader")), "config"); - - final TestActorRef followerShard = actorFactory.createTestActor( - Shard.builder().id(followerShardID). - datastoreContext(dataStoreContextBuilder.shardElectionTimeoutFactor(1000).build()). - peerAddresses(Collections.singletonMap(leaderShardID.toString(), - "akka://test/user/" + leaderShardID.toString())).schemaContext(SCHEMA_CONTEXT).props(). - withDispatcher(Dispatchers.DefaultDispatcherId()), followerShardID.toString()); - - final TestActorRef leaderShard = actorFactory.createTestActor( - Shard.builder().id(leaderShardID).datastoreContext(newDatastoreContext()). - peerAddresses(Collections.singletonMap(followerShardID.toString(), - "akka://test/user/" + followerShardID.toString())).schemaContext(SCHEMA_CONTEXT).props(). - withDispatcher(Dispatchers.DefaultDispatcherId()), leaderShardID.toString()); - - leaderShard.tell(TimeoutNow.INSTANCE, ActorRef.noSender()); - final String leaderPath = waitUntilLeader(followerShard); - assertEquals("Shard leader path", leaderShard.path().toString(), leaderPath); - - final YangInstanceIdentifier path = TestModel.TEST_PATH; - final MockDataTreeChangeListener listener = new MockDataTreeChangeListener(1); - final ActorRef dclActor = actorFactory.createActor(DataTreeChangeListenerActor.props(listener), - actorFactory.generateActorId(testName + "-DataTreeChangeListener")); - - followerShard.tell(new RegisterDataTreeChangeListener(TestModel.TEST_PATH, dclActor, true), getRef()); - final RegisterDataTreeChangeListenerReply reply = expectMsgClass(duration("5 seconds"), - RegisterDataTreeChangeListenerReply.class); - assertNotNull("getListenerRegistrationPath", reply.getListenerRegistrationPath()); - - writeToStore(followerShard, path, ImmutableNodes.containerNode(TestModel.TEST_QNAME)); - - listener.waitForChangeEvents(); - }}; + final ShardTestKit testKit = new ShardTestKit(getSystem()); + final String testName = "testClusteredDataTreeChangeListenerRegistration"; + final ShardIdentifier followerShardID = ShardIdentifier.create("inventory", + MemberName.forName(actorFactory.generateActorId(testName + "-follower")), "config"); + + final ShardIdentifier leaderShardID = ShardIdentifier.create("inventory", + MemberName.forName(actorFactory.generateActorId(testName + "-leader")), "config"); + + final TestActorRef followerShard = actorFactory + .createTestActor(Shard.builder().id(followerShardID) + .datastoreContext(dataStoreContextBuilder.shardElectionTimeoutFactor(1000).build()) + .peerAddresses(Collections.singletonMap(leaderShardID.toString(), + "akka://test/user/" + leaderShardID.toString())) + .schemaContextProvider(() -> SCHEMA_CONTEXT).props() + .withDispatcher(Dispatchers.DefaultDispatcherId()), followerShardID.toString()); + + final TestActorRef leaderShard = actorFactory + .createTestActor(Shard.builder().id(leaderShardID).datastoreContext(newDatastoreContext()) + .peerAddresses(Collections.singletonMap(followerShardID.toString(), + "akka://test/user/" + followerShardID.toString())) + .schemaContextProvider(() -> SCHEMA_CONTEXT).props() + .withDispatcher(Dispatchers.DefaultDispatcherId()), leaderShardID.toString()); + + leaderShard.tell(TimeoutNow.INSTANCE, ActorRef.noSender()); + final String leaderPath = ShardTestKit.waitUntilLeader(followerShard); + assertEquals("Shard leader path", leaderShard.path().toString(), leaderPath); + + final YangInstanceIdentifier path = TestModel.TEST_PATH; + final MockDataTreeChangeListener listener = new MockDataTreeChangeListener(1); + final ActorRef dclActor = actorFactory.createActor(DataTreeChangeListenerActor.props(listener, path), + actorFactory.generateActorId(testName + "-DataTreeChangeListener")); + + followerShard.tell(new RegisterDataTreeChangeListener(TestModel.TEST_PATH, dclActor, true), testKit.getRef()); + final RegisterDataTreeNotificationListenerReply reply = testKit.expectMsgClass(Duration.ofSeconds(5), + RegisterDataTreeNotificationListenerReply.class); + assertNotNull("getListenerRegistrationPath", reply.getListenerRegistrationPath()); + + writeToStore(followerShard, path, ImmutableNodes.containerNode(TestModel.TEST_QNAME)); + + listener.waitForChangeEvents(); } @Test - public void testServerRemoved() throws Exception { - final TestActorRef parent = actorFactory.createTestActor(MessageCollectorActor.props()); + public void testServerRemoved() { + final TestActorRef parent = actorFactory.createTestActor(MessageCollectorActor.props() + .withDispatcher(Dispatchers.DefaultDispatcherId())); final ActorRef shard = parent.underlyingActor().context().actorOf( newShardBuilder().props().withDispatcher(Dispatchers.DefaultDispatcherId()),