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%2FShardDataTreeTest.java;h=ce07093632f48bbf8a5c9316b8caa50bf0fbe6a5;hp=73b5e560be43d256c2dc5865d96839476f4adc53;hb=HEAD;hpb=b9711f17a53a4fad48197df6c39b58e4faadc862 diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardDataTreeTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardDataTreeTest.java index 73b5e560be..ef6b2448f7 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardDataTreeTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardDataTreeTest.java @@ -36,7 +36,6 @@ import com.google.common.base.Ticker; import com.google.common.primitives.UnsignedLong; import com.google.common.util.concurrent.FutureCallback; import java.io.IOException; -import java.math.BigInteger; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -49,7 +48,6 @@ import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.InOrder; import org.mockito.Mockito; -import org.opendaylight.controller.cluster.datastore.jmx.mbeans.shard.ShardStats; import org.opendaylight.controller.cluster.datastore.persisted.CommitTransactionPayload; import org.opendaylight.controller.cluster.datastore.persisted.MetadataShardDataTreeSnapshot; import org.opendaylight.controller.cluster.datastore.persisted.PayloadVersion; @@ -58,6 +56,7 @@ import org.opendaylight.controller.md.cluster.datastore.model.CarsModel; import org.opendaylight.controller.md.cluster.datastore.model.PeopleModel; import org.opendaylight.controller.md.cluster.datastore.model.SchemaContextHelper; import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeListener; +import org.opendaylight.yangtools.yang.common.Empty; import org.opendaylight.yangtools.yang.common.Uint64; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; @@ -65,18 +64,18 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdent import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; 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.DataTreeCandidates; -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.DataTreeSnapshot; -import org.opendaylight.yangtools.yang.data.api.schema.tree.DataValidationFailedException; -import org.opendaylight.yangtools.yang.data.api.schema.tree.ModificationType; -import org.opendaylight.yangtools.yang.data.api.schema.tree.TreeType; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; -import org.opendaylight.yangtools.yang.data.impl.schema.tree.InMemoryDataTreeFactory; +import org.opendaylight.yangtools.yang.data.tree.api.DataTree; +import org.opendaylight.yangtools.yang.data.tree.api.DataTreeCandidate; +import org.opendaylight.yangtools.yang.data.tree.api.DataTreeConfiguration; +import org.opendaylight.yangtools.yang.data.tree.api.DataTreeModification; +import org.opendaylight.yangtools.yang.data.tree.api.DataTreeSnapshot; +import org.opendaylight.yangtools.yang.data.tree.api.DataValidationFailedException; +import org.opendaylight.yangtools.yang.data.tree.api.ModificationType; +import org.opendaylight.yangtools.yang.data.tree.api.TreeType; +import org.opendaylight.yangtools.yang.data.tree.impl.di.InMemoryDataTreeFactory; +import org.opendaylight.yangtools.yang.data.tree.spi.DataTreeCandidates; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.SchemaContext; @@ -90,7 +89,7 @@ public class ShardDataTreeTest extends AbstractTest { @Before public void setUp() { doReturn(Ticker.systemTicker()).when(mockShard).ticker(); - doReturn(mock(ShardStats.class)).when(mockShard).getShardMBean(); + doReturn(new ShardStats("shardName", "mxBeanType", mockShard)).when(mockShard).getShardMBean(); doReturn(DATASTORE_CONTEXT).when(mockShard).getDatastoreContext(); fullSchema = SchemaContextHelper.full(); @@ -139,11 +138,11 @@ public class ShardDataTreeTest extends AbstractTest { final DataTreeSnapshot snapshot1 = readOnlyShardDataTreeTransaction.getSnapshot(); - final Optional> optional = snapshot1.readNode(CarsModel.BASE_PATH); + final Optional optional = snapshot1.readNode(CarsModel.BASE_PATH); assertEquals(expectedCarsPresent, optional.isPresent()); - final Optional> optional1 = snapshot1.readNode(PeopleModel.BASE_PATH); + final Optional optional1 = snapshot1.readNode(PeopleModel.BASE_PATH); assertEquals(expectedPeoplePresent, optional1.isPresent()); } @@ -156,11 +155,11 @@ public class ShardDataTreeTest extends AbstractTest { candidates.add(addCar(shardDataTree)); candidates.add(removeCar(shardDataTree)); - final NormalizedNode expected = getCars(shardDataTree); + final NormalizedNode expected = getCars(shardDataTree); applyCandidates(shardDataTree, candidates); - final NormalizedNode actual = getCars(shardDataTree); + final NormalizedNode actual = getCars(shardDataTree); assertEquals(expected, actual); } @@ -175,11 +174,11 @@ public class ShardDataTreeTest extends AbstractTest { candidates.add(addCar(shardDataTree)); candidates.add(removeCar(shardDataTree)); - final NormalizedNode expected = getCars(shardDataTree); + final NormalizedNode expected = getCars(shardDataTree); applyCandidates(shardDataTree, candidates); - final NormalizedNode actual = getCars(shardDataTree); + final NormalizedNode actual = getCars(shardDataTree); assertEquals(expected, actual); } @@ -195,14 +194,14 @@ public class ShardDataTreeTest extends AbstractTest { addCar(shardDataTree, "optima"); verifyOnDataTreeChanged(listener, dtc -> { - assertEquals("getModificationType", ModificationType.WRITE, dtc.getRootNode().getModificationType()); + assertEquals("getModificationType", ModificationType.WRITE, dtc.getRootNode().modificationType()); assertEquals("getRootPath", CarsModel.newCarPath("optima"), dtc.getRootPath()); }); addCar(shardDataTree, "sportage"); verifyOnDataTreeChanged(listener, dtc -> { - assertEquals("getModificationType", ModificationType.WRITE, dtc.getRootNode().getModificationType()); + assertEquals("getModificationType", ModificationType.WRITE, dtc.getRootNode().modificationType()); assertEquals("getRootPath", CarsModel.newCarPath("sportage"), dtc.getRootPath()); }); @@ -220,7 +219,7 @@ public class ShardDataTreeTest extends AbstractTest { verifyOnDataTreeChanged(listener, dtc -> { ModificationType expType = expChanges.remove(dtc.getRootPath()); assertNotNull("Got unexpected change for " + dtc.getRootPath(), expType); - assertEquals("getModificationType", expType, dtc.getRootNode().getModificationType()); + assertEquals("getModificationType", expType, dtc.getRootNode().modificationType()); }); if (!expChanges.isEmpty()) { @@ -236,7 +235,7 @@ public class ShardDataTreeTest extends AbstractTest { final ShardDataTreeCohort cohort2 = newShardDataTreeCohort(snapshot -> snapshot.write(CarsModel.CAR_LIST_PATH, CarsModel.newCarMapNode())); - NormalizedNode peopleNode = PeopleModel.create(); + NormalizedNode peopleNode = PeopleModel.create(); final ShardDataTreeCohort cohort3 = newShardDataTreeCohort(snapshot -> snapshot.write(PeopleModel.BASE_PATH, peopleNode)); @@ -245,64 +244,64 @@ public class ShardDataTreeTest extends AbstractTest { final ShardDataTreeCohort cohort4 = newShardDataTreeCohort(snapshot -> snapshot.write(carPath, carNode)); immediateCanCommit(cohort1); - final FutureCallback canCommitCallback2 = coordinatedCanCommit(cohort2); - final FutureCallback canCommitCallback3 = coordinatedCanCommit(cohort3); - final FutureCallback canCommitCallback4 = coordinatedCanCommit(cohort4); + final FutureCallback canCommitCallback2 = coordinatedCanCommit(cohort2); + final FutureCallback canCommitCallback3 = coordinatedCanCommit(cohort3); + final FutureCallback canCommitCallback4 = coordinatedCanCommit(cohort4); final FutureCallback preCommitCallback1 = coordinatedPreCommit(cohort1); verify(preCommitCallback1).onSuccess(cohort1.getCandidate()); - verify(canCommitCallback2).onSuccess(null); + verify(canCommitCallback2).onSuccess(Empty.value()); final FutureCallback preCommitCallback2 = coordinatedPreCommit(cohort2); verify(preCommitCallback2).onSuccess(cohort2.getCandidate()); - verify(canCommitCallback3).onSuccess(null); + verify(canCommitCallback3).onSuccess(Empty.value()); final FutureCallback preCommitCallback3 = coordinatedPreCommit(cohort3); verify(preCommitCallback3).onSuccess(cohort3.getCandidate()); - verify(canCommitCallback4).onSuccess(null); + verify(canCommitCallback4).onSuccess(Empty.value()); final FutureCallback preCommitCallback4 = coordinatedPreCommit(cohort4); verify(preCommitCallback4).onSuccess(cohort4.getCandidate()); final FutureCallback commitCallback2 = coordinatedCommit(cohort2); - verify(mockShard, never()).persistPayload(eq(cohort1.getIdentifier()), any(CommitTransactionPayload.class), + verify(mockShard, never()).persistPayload(eq(cohort1.transactionId()), any(CommitTransactionPayload.class), anyBoolean()); verifyNoMoreInteractions(commitCallback2); final FutureCallback commitCallback4 = coordinatedCommit(cohort4); - verify(mockShard, never()).persistPayload(eq(cohort4.getIdentifier()), any(CommitTransactionPayload.class), + verify(mockShard, never()).persistPayload(eq(cohort4.transactionId()), any(CommitTransactionPayload.class), anyBoolean()); verifyNoMoreInteractions(commitCallback4); final FutureCallback commitCallback1 = coordinatedCommit(cohort1); InOrder inOrder = inOrder(mockShard); - inOrder.verify(mockShard).persistPayload(eq(cohort1.getIdentifier()), any(CommitTransactionPayload.class), + inOrder.verify(mockShard).persistPayload(eq(cohort1.transactionId()), any(CommitTransactionPayload.class), eq(true)); - inOrder.verify(mockShard).persistPayload(eq(cohort2.getIdentifier()), any(CommitTransactionPayload.class), + inOrder.verify(mockShard).persistPayload(eq(cohort2.transactionId()), any(CommitTransactionPayload.class), eq(false)); verifyNoMoreInteractions(commitCallback1); verifyNoMoreInteractions(commitCallback2); final FutureCallback commitCallback3 = coordinatedCommit(cohort3); inOrder = inOrder(mockShard); - inOrder.verify(mockShard).persistPayload(eq(cohort3.getIdentifier()), any(CommitTransactionPayload.class), + inOrder.verify(mockShard).persistPayload(eq(cohort3.transactionId()), any(CommitTransactionPayload.class), eq(true)); - inOrder.verify(mockShard).persistPayload(eq(cohort4.getIdentifier()), any(CommitTransactionPayload.class), + inOrder.verify(mockShard).persistPayload(eq(cohort4.transactionId()), any(CommitTransactionPayload.class), eq(false)); verifyNoMoreInteractions(commitCallback3); verifyNoMoreInteractions(commitCallback4); final ShardDataTreeCohort cohort5 = newShardDataTreeCohort(snapshot -> snapshot.merge(CarsModel.BASE_PATH, CarsModel.emptyContainer())); - final FutureCallback canCommitCallback5 = coordinatedCanCommit(cohort5); + final FutureCallback canCommitCallback5 = coordinatedCanCommit(cohort5); // The payload instance doesn't matter - it just needs to be of type CommitTransactionPayload. CommitTransactionPayload mockPayload = CommitTransactionPayload.create(nextTransactionId(), cohort1.getCandidate()); - shardDataTree.applyReplicatedPayload(cohort1.getIdentifier(), mockPayload); - shardDataTree.applyReplicatedPayload(cohort2.getIdentifier(), mockPayload); - shardDataTree.applyReplicatedPayload(cohort3.getIdentifier(), mockPayload); - shardDataTree.applyReplicatedPayload(cohort4.getIdentifier(), mockPayload); + shardDataTree.applyReplicatedPayload(cohort1.transactionId(), mockPayload); + shardDataTree.applyReplicatedPayload(cohort2.transactionId(), mockPayload); + shardDataTree.applyReplicatedPayload(cohort3.transactionId(), mockPayload); + shardDataTree.applyReplicatedPayload(cohort4.transactionId(), mockPayload); inOrder = inOrder(commitCallback1, commitCallback2, commitCallback3, commitCallback4); inOrder.verify(commitCallback1).onSuccess(any(UnsignedLong.class)); @@ -310,17 +309,12 @@ public class ShardDataTreeTest extends AbstractTest { inOrder.verify(commitCallback3).onSuccess(any(UnsignedLong.class)); inOrder.verify(commitCallback4).onSuccess(any(UnsignedLong.class)); - verify(canCommitCallback5).onSuccess(null); + verify(canCommitCallback5).onSuccess(Empty.value()); final DataTreeSnapshot snapshot = shardDataTree.newReadOnlyTransaction(nextTransactionId()).getSnapshot(); - Optional> optional = snapshot.readNode(carPath); - assertTrue("Car node present", optional.isPresent()); - assertEquals("Car node", carNode, optional.get()); - - optional = snapshot.readNode(PeopleModel.BASE_PATH); - assertTrue("People node present", optional.isPresent()); - assertEquals("People node", peopleNode, optional.get()); + assertEquals("Car node", Optional.of(carNode), snapshot.readNode(carPath)); + assertEquals("People node", Optional.of(peopleNode), snapshot.readNode(PeopleModel.BASE_PATH)); } @Test @@ -340,19 +334,19 @@ public class ShardDataTreeTest extends AbstractTest { final FutureCallback commitCallback1 = immediate3PhaseCommit(cohort1); InOrder inOrder = inOrder(mockShard); - inOrder.verify(mockShard).persistPayload(eq(cohort1.getIdentifier()), any(CommitTransactionPayload.class), + inOrder.verify(mockShard).persistPayload(eq(cohort1.transactionId()), any(CommitTransactionPayload.class), eq(true)); - inOrder.verify(mockShard).persistPayload(eq(cohort2.getIdentifier()), any(CommitTransactionPayload.class), + inOrder.verify(mockShard).persistPayload(eq(cohort2.transactionId()), any(CommitTransactionPayload.class), eq(true)); - inOrder.verify(mockShard).persistPayload(eq(cohort3.getIdentifier()), any(CommitTransactionPayload.class), + inOrder.verify(mockShard).persistPayload(eq(cohort3.transactionId()), any(CommitTransactionPayload.class), eq(false)); // The payload instance doesn't matter - it just needs to be of type CommitTransactionPayload. CommitTransactionPayload mockPayload = CommitTransactionPayload.create(nextTransactionId(), cohort1.getCandidate()); - shardDataTree.applyReplicatedPayload(cohort1.getIdentifier(), mockPayload); - shardDataTree.applyReplicatedPayload(cohort2.getIdentifier(), mockPayload); - shardDataTree.applyReplicatedPayload(cohort3.getIdentifier(), mockPayload); + shardDataTree.applyReplicatedPayload(cohort1.transactionId(), mockPayload); + shardDataTree.applyReplicatedPayload(cohort2.transactionId(), mockPayload); + shardDataTree.applyReplicatedPayload(cohort3.transactionId(), mockPayload); inOrder = inOrder(commitCallback1, commitCallback2, commitCallback3); inOrder.verify(commitCallback1).onSuccess(any(UnsignedLong.class)); @@ -361,9 +355,7 @@ public class ShardDataTreeTest extends AbstractTest { final DataTreeSnapshot snapshot = shardDataTree.newReadOnlyTransaction(nextTransactionId()).getSnapshot(); - Optional> optional = snapshot.readNode(carPath); - assertTrue("Car node present", optional.isPresent()); - assertEquals("Car node", carNode, optional.get()); + assertEquals("Car node", Optional.of(carNode), snapshot.readNode(carPath)); } @Test @@ -390,7 +382,7 @@ public class ShardDataTreeTest extends AbstractTest { inOrder.verify(commitCallback3).onSuccess(any(UnsignedLong.class)); final DataTreeSnapshot snapshot = shardDataTree.newReadOnlyTransaction(nextTransactionId()).getSnapshot(); - Optional> optional = snapshot.readNode(CarsModel.BASE_PATH); + Optional optional = snapshot.readNode(CarsModel.BASE_PATH); assertTrue("Car node present", optional.isPresent()); } @@ -419,10 +411,10 @@ public class ShardDataTreeTest extends AbstractTest { coordinatedPreCommit(cohort2); coordinatedPreCommit(cohort3); - FutureCallback mockAbortCallback = mock(FutureCallback.class); - doNothing().when(mockAbortCallback).onSuccess(null); + FutureCallback mockAbortCallback = mock(FutureCallback.class); + doNothing().when(mockAbortCallback).onSuccess(Empty.value()); cohort2.abort(mockAbortCallback); - verify(mockAbortCallback).onSuccess(null); + verify(mockAbortCallback).onSuccess(Empty.value()); coordinatedPreCommit(cohort4); coordinatedCommit(cohort1); @@ -430,25 +422,24 @@ public class ShardDataTreeTest extends AbstractTest { coordinatedCommit(cohort4); InOrder inOrder = inOrder(mockShard); - inOrder.verify(mockShard).persistPayload(eq(cohort1.getIdentifier()), any(CommitTransactionPayload.class), + inOrder.verify(mockShard).persistPayload(eq(cohort1.transactionId()), any(CommitTransactionPayload.class), eq(false)); - inOrder.verify(mockShard).persistPayload(eq(cohort3.getIdentifier()), any(CommitTransactionPayload.class), + inOrder.verify(mockShard).persistPayload(eq(cohort3.transactionId()), any(CommitTransactionPayload.class), eq(false)); - inOrder.verify(mockShard).persistPayload(eq(cohort4.getIdentifier()), any(CommitTransactionPayload.class), + inOrder.verify(mockShard).persistPayload(eq(cohort4.transactionId()), any(CommitTransactionPayload.class), eq(false)); // The payload instance doesn't matter - it just needs to be of type CommitTransactionPayload. CommitTransactionPayload mockPayload = CommitTransactionPayload.create(nextTransactionId(), cohort1.getCandidate()); - shardDataTree.applyReplicatedPayload(cohort1.getIdentifier(), mockPayload); - shardDataTree.applyReplicatedPayload(cohort3.getIdentifier(), mockPayload); - shardDataTree.applyReplicatedPayload(cohort4.getIdentifier(), mockPayload); + shardDataTree.applyReplicatedPayload(cohort1.transactionId(), mockPayload); + shardDataTree.applyReplicatedPayload(cohort3.transactionId(), mockPayload); + shardDataTree.applyReplicatedPayload(cohort4.transactionId(), mockPayload); final DataTreeSnapshot snapshot = shardDataTree.newReadOnlyTransaction(nextTransactionId()).getSnapshot(); - Optional> optional = snapshot.readNode(carPath); - assertTrue("Car node present", optional.isPresent()); - assertEquals("Car node", carNode, optional.get()); + Optional optional = snapshot.readNode(carPath); + assertEquals("Car node", Optional.of(carNode), optional); } @SuppressWarnings("unchecked") @@ -462,20 +453,20 @@ public class ShardDataTreeTest extends AbstractTest { final ShardDataTreeCohort cohort2 = newShardDataTreeCohort(snapshot -> snapshot.write(CarsModel.CAR_LIST_PATH, CarsModel.newCarMapNode())); - NormalizedNode peopleNode = PeopleModel.create(); + NormalizedNode peopleNode = PeopleModel.create(); final ShardDataTreeCohort cohort3 = newShardDataTreeCohort(snapshot -> snapshot.write(PeopleModel.BASE_PATH, peopleNode)); immediateCanCommit(cohort1); - FutureCallback canCommitCallback2 = coordinatedCanCommit(cohort2); + FutureCallback canCommitCallback2 = coordinatedCanCommit(cohort2); coordinatedPreCommit(cohort1); - verify(canCommitCallback2).onSuccess(null); + verify(canCommitCallback2).onSuccess(Empty.value()); - FutureCallback mockAbortCallback = mock(FutureCallback.class); - doNothing().when(mockAbortCallback).onSuccess(null); + FutureCallback mockAbortCallback = mock(FutureCallback.class); + doNothing().when(mockAbortCallback).onSuccess(Empty.value()); cohort1.abort(mockAbortCallback); - verify(mockAbortCallback).onSuccess(null); + verify(mockAbortCallback).onSuccess(Empty.value()); FutureCallback preCommitCallback2 = coordinatedPreCommit(cohort2); verify(preCommitCallback2).onFailure(any(Throwable.class)); @@ -486,16 +477,15 @@ public class ShardDataTreeTest extends AbstractTest { final DataTreeSnapshot snapshot = shardDataTree.newReadOnlyTransaction(nextTransactionId()).getSnapshot(); - Optional> optional = snapshot.readNode(PeopleModel.BASE_PATH); - assertTrue("People node present", optional.isPresent()); - assertEquals("People node", peopleNode, optional.get()); + Optional optional = snapshot.readNode(PeopleModel.BASE_PATH); + assertEquals("People node", Optional.of(peopleNode), optional); } @Test public void testUintCommitPayload() throws IOException { shardDataTree.applyRecoveryPayload(CommitTransactionPayload.create(nextTransactionId(), - DataTreeCandidates.fromNormalizedNode(YangInstanceIdentifier.empty(), bigIntegerRoot()), - PayloadVersion.SODIUM_SR1)); + DataTreeCandidates.fromNormalizedNode(YangInstanceIdentifier.of(), bigIntegerRoot()), + PayloadVersion.POTASSIUM)); assertCarsUint64(); } @@ -521,7 +511,7 @@ public class ShardDataTreeTest extends AbstractTest { .withNodeIdentifier(new NodeIdentifier(CarsModel.BASE_QNAME)) .withChild(Builders.mapBuilder() .withNodeIdentifier(new NodeIdentifier(CarsModel.CAR_QNAME)) - .withChild(createCar("one", BigInteger.ONE)) + .withChild(createCar("one", Uint64.ONE)) .build()) .build()); mod.ready(); @@ -530,7 +520,7 @@ public class ShardDataTreeTest extends AbstractTest { dataTree.commit(first); mod = dataTree.takeSnapshot().newModification(); - mod.write(CarsModel.newCarPath("two"), createCar("two", BigInteger.TWO)); + mod.write(CarsModel.newCarPath("two"), createCar("two", Uint64.TWO)); mod.ready(); dataTree.validate(mod); final DataTreeCandidate second = dataTree.prepare(mod); @@ -539,7 +529,7 @@ public class ShardDataTreeTest extends AbstractTest { mod = dataTree.takeSnapshot().newModification(); mod.merge(CarsModel.CAR_LIST_PATH, Builders.mapBuilder() .withNodeIdentifier(new NodeIdentifier(CarsModel.CAR_QNAME)) - .withChild(createCar("three", BigInteger.TEN)) + .withChild(createCar("three", Uint64.TEN)) .build()); mod.ready(); dataTree.validate(mod); @@ -547,17 +537,16 @@ public class ShardDataTreeTest extends AbstractTest { dataTree.commit(third); // Apply first candidate as a snapshot - shardDataTree.applyRecoverySnapshot( - new ShardSnapshotState(new MetadataShardDataTreeSnapshot(first.getRootNode().getDataAfter().get()), true)); + shardDataTree.applyRecoverySnapshot(new ShardSnapshotState( + new MetadataShardDataTreeSnapshot(first.getRootNode().getDataAfter()), true)); // Apply the other two snapshots as transactions shardDataTree.applyRecoveryPayload(CommitTransactionPayload.create(nextTransactionId(), second, - PayloadVersion.SODIUM_SR1)); + PayloadVersion.POTASSIUM)); shardDataTree.applyRecoveryPayload(CommitTransactionPayload.create(nextTransactionId(), third, - PayloadVersion.SODIUM_SR1)); + PayloadVersion.POTASSIUM)); // Verify uint translation final DataTreeSnapshot snapshot = shardDataTree.newReadOnlyTransaction(nextTransactionId()).getSnapshot(); - final NormalizedNode cars = snapshot.readNode(CarsModel.CAR_LIST_PATH).get(); assertEquals(Builders.mapBuilder() .withNodeIdentifier(new NodeIdentifier(CarsModel.CAR_QNAME)) @@ -565,12 +554,12 @@ public class ShardDataTreeTest extends AbstractTest { .withChild(createCar("one", Uint64.ONE)) .withChild(createCar("two", Uint64.TWO)) .withChild(createCar("three", Uint64.TEN)) - .build(), cars); + .build(), snapshot.readNode(CarsModel.CAR_LIST_PATH).orElseThrow()); } private void assertCarsUint64() { final DataTreeSnapshot snapshot = shardDataTree.newReadOnlyTransaction(nextTransactionId()).getSnapshot(); - final NormalizedNode cars = snapshot.readNode(CarsModel.CAR_LIST_PATH).get(); + final NormalizedNode cars = snapshot.readNode(CarsModel.CAR_LIST_PATH).orElseThrow(); assertEquals(Builders.mapBuilder() .withNodeIdentifier(new NodeIdentifier(CarsModel.CAR_QNAME)) @@ -581,25 +570,24 @@ public class ShardDataTreeTest extends AbstractTest { private static ContainerNode bigIntegerRoot() { return Builders.containerBuilder() - .withNodeIdentifier(new NodeIdentifier(SchemaContext.NAME)) - .withChild(Builders.containerBuilder() - .withNodeIdentifier(new NodeIdentifier(CarsModel.CARS_QNAME)) - .withChild(Builders.mapBuilder() - .withNodeIdentifier(new NodeIdentifier(CarsModel.CAR_QNAME)) - // Note: BigInteger - .withChild(createCar("foo", BigInteger.ONE)) - .build()) + .withNodeIdentifier(new NodeIdentifier(SchemaContext.NAME)) + .withChild(Builders.containerBuilder() + .withNodeIdentifier(new NodeIdentifier(CarsModel.CARS_QNAME)) + .withChild(Builders.mapBuilder() + .withNodeIdentifier(new NodeIdentifier(CarsModel.CAR_QNAME)) + .withChild(createCar("foo", Uint64.ONE)) .build()) - .build(); + .build()) + .build(); } private static MapEntryNode createCar(final String name, final Object value) { return Builders.mapEntryBuilder() - .withNodeIdentifier(NodeIdentifierWithPredicates.of(CarsModel.CAR_QNAME,CarsModel.CAR_NAME_QNAME, name)) - .withChild(ImmutableNodes.leafNode(CarsModel.CAR_NAME_QNAME, name)) - // Note: old BigInteger - .withChild(ImmutableNodes.leafNode(CarsModel.CAR_PRICE_QNAME, value)) - .build(); + .withNodeIdentifier(NodeIdentifierWithPredicates.of(CarsModel.CAR_QNAME, CarsModel.CAR_NAME_QNAME, name)) + .withChild(ImmutableNodes.leafNode(CarsModel.CAR_NAME_QNAME, name)) + // Note: old BigInteger + .withChild(ImmutableNodes.leafNode(CarsModel.CAR_PRICE_QNAME, value)) + .build(); } private ShardDataTreeCohort newShardDataTreeCohort(final DataTreeOperation operation) { @@ -613,7 +601,7 @@ public class ShardDataTreeTest extends AbstractTest { @SuppressWarnings({ "rawtypes", "unchecked" }) private static void verifyOnDataTreeChanged(final DOMDataTreeChangeListener listener, final Consumer callback) { - ArgumentCaptor changes = ArgumentCaptor.forClass(Collection.class); + ArgumentCaptor changes = ArgumentCaptor.forClass(List.class); verify(listener, atLeastOnce()).onDataTreeChanged(changes.capture()); for (Collection list : changes.getAllValues()) { for (Object dtc : list) { @@ -624,16 +612,16 @@ public class ShardDataTreeTest extends AbstractTest { reset(listener); } - private static NormalizedNode getCars(final ShardDataTree shardDataTree) { + private static NormalizedNode getCars(final ShardDataTree shardDataTree) { final ReadOnlyShardDataTreeTransaction readOnlyShardDataTreeTransaction = shardDataTree.newReadOnlyTransaction(nextTransactionId()); final DataTreeSnapshot snapshot1 = readOnlyShardDataTreeTransaction.getSnapshot(); - final Optional> optional = snapshot1.readNode(CarsModel.BASE_PATH); + final Optional optional = snapshot1.readNode(CarsModel.BASE_PATH); assertTrue(optional.isPresent()); - return optional.get(); + return optional.orElseThrow(); } private static DataTreeCandidate addCar(final ShardDataTree shardDataTree) {