@Test
public void testSerialization() {
YangInstanceIdentifier writePath = TestModel.TEST_PATH;
- NormalizedNode<?, ?> writeData = ImmutableContainerNodeBuilder.create().withNodeIdentifier(
+ NormalizedNode writeData = ImmutableContainerNodeBuilder.create().withNodeIdentifier(
new YangInstanceIdentifier.NodeIdentifier(TestModel.TEST_QNAME))
.withChild(ImmutableNodes.leafNode(TestModel.DESC_QNAME, "foo")).build();
YangInstanceIdentifier mergePath = TestModel.OUTER_LIST_PATH;
- NormalizedNode<?, ?> mergeData = ImmutableContainerNodeBuilder.create().withNodeIdentifier(
+ NormalizedNode mergeData = ImmutableContainerNodeBuilder.create().withNodeIdentifier(
new YangInstanceIdentifier.NodeIdentifier(TestModel.OUTER_LIST_QNAME)).build();
YangInstanceIdentifier deletePath = TestModel.TEST_PATH;
assertEquals("getTransactionID", tx2, clone.getTransactionId());
assertTrue("isReady", clone.isReady());
assertTrue("isDoCommitOnReady", clone.isDoCommitOnReady());
- assertTrue("participatingShardNames present", clone.getParticipatingShardNames().isPresent());
- assertEquals("participatingShardNames", shardNames, clone.getParticipatingShardNames().get());
+ assertEquals("participatingShardNames", Optional.of(shardNames), clone.getParticipatingShardNames());
assertEquals("getModifications size", 0, clone.getModifications().size());
// Test not ready.
assertEquals("getTransactionID", tx2, clone.getTransactionId());
assertFalse("isReady", clone.isReady());
assertEquals("getModifications size", 0, clone.getModifications().size());
-
- // Test pre-Flourine
-
- batched = new BatchedModifications(tx2, DataStoreVersions.BORON_VERSION);
- batched.addModification(new WriteModification(writePath, writeData));
- batched.setReady(Optional.of(ImmutableSortedSet.of("one", "two")));
-
- clone = (BatchedModifications) SerializationUtils.clone((Serializable) batched.toSerializable());
-
- assertEquals("getVersion", DataStoreVersions.BORON_VERSION, clone.getVersion());
- assertEquals("getTransactionID", tx2, clone.getTransactionId());
- assertTrue("isReady", clone.isReady());
- assertFalse("participatingShardNames present", clone.getParticipatingShardNames().isPresent());
- assertEquals("getModifications size", 1, clone.getModifications().size());
}
@Test