X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fmodification%2FMutableCompositeModificationTest.java;h=c4fcaab0e4523d1abc60704367ef8088fd57ec83;hb=HEAD;hp=b9d44b2586f75a34b163322f9888b94419dd7cee;hpb=d2d4cefa4d8d662554b7f2fc0b0dd568d0db1180;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/modification/MutableCompositeModificationTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/modification/MutableCompositeModificationTest.java index b9d44b2586..3d58db873d 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/modification/MutableCompositeModificationTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/modification/MutableCompositeModificationTest.java @@ -1,24 +1,29 @@ +/* + * Copyright (c) 2014, 2015 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * 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.modification; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import com.google.common.base.Optional; -import com.google.common.base.Stopwatch; -import org.apache.commons.lang.SerializationUtils; -import org.junit.Ignore; + +import org.apache.commons.lang3.SerializationUtils; import org.junit.Test; +import org.opendaylight.controller.cluster.datastore.DataStoreVersions; import org.opendaylight.controller.md.cluster.datastore.model.TestModel; -import org.opendaylight.controller.sal.core.spi.data.DOMStoreReadWriteTransaction; +import org.opendaylight.mdsal.dom.spi.store.DOMStoreReadWriteTransaction; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; -import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; +import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; +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.builder.impl.ImmutableContainerNodeBuilder; +@Deprecated(since = "9.0.0", forRemoval = true) public class MutableCompositeModificationTest extends AbstractModificationTest { - @Test public void testApply() throws Exception { - MutableCompositeModification compositeModification = new MutableCompositeModification(); compositeModification.addModification(new WriteModification(TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME))); @@ -27,74 +32,94 @@ public class MutableCompositeModificationTest extends AbstractModificationTest { compositeModification.apply(transaction); commitTransaction(transaction); - Optional> data = readData(TestModel.TEST_PATH); - - assertNotNull(data.get()); - assertEquals(TestModel.TEST_QNAME, data.get().getNodeType()); + assertEquals(TestModel.TEST_QNAME, readData(TestModel.TEST_PATH).orElseThrow().name().getNodeType()); } @Test public void testSerialization() { YangInstanceIdentifier writePath = TestModel.TEST_PATH; - NormalizedNode writeData = ImmutableContainerNodeBuilder.create().withNodeIdentifier( - new YangInstanceIdentifier.NodeIdentifier(TestModel.TEST_QNAME)). - withChild(ImmutableNodes.leafNode(TestModel.DESC_QNAME, "foo")).build(); + ContainerNode writeData = Builders.containerBuilder() + .withNodeIdentifier(new NodeIdentifier(TestModel.TEST_QNAME)) + .withChild(ImmutableNodes.leafNode(TestModel.DESC_QNAME, "foo")) + .build(); YangInstanceIdentifier mergePath = TestModel.OUTER_LIST_PATH; - NormalizedNode mergeData = ImmutableContainerNodeBuilder.create().withNodeIdentifier( - new YangInstanceIdentifier.NodeIdentifier(TestModel.OUTER_LIST_QNAME)).build(); + ContainerNode mergeData = Builders.containerBuilder() + .withNodeIdentifier(new NodeIdentifier(TestModel.OUTER_LIST_QNAME)) + .build(); YangInstanceIdentifier deletePath = TestModel.TEST_PATH; - MutableCompositeModification compositeModification = new MutableCompositeModification(); + MutableCompositeModification compositeModification = + new MutableCompositeModification(DataStoreVersions.POTASSIUM_VERSION); compositeModification.addModification(new WriteModification(writePath, writeData)); compositeModification.addModification(new MergeModification(mergePath, mergeData)); compositeModification.addModification(new DeleteModification(deletePath)); - MutableCompositeModification clone = (MutableCompositeModification) SerializationUtils.clone(compositeModification); + final byte[] bytes = SerializationUtils.serialize(compositeModification); + assertEquals(360, bytes.length); + MutableCompositeModification clone = (MutableCompositeModification) SerializationUtils.deserialize(bytes); + + assertEquals("getVersion", DataStoreVersions.POTASSIUM_VERSION, clone.getVersion()); assertEquals("getModifications size", 3, clone.getModifications().size()); WriteModification write = (WriteModification)clone.getModifications().get(0); + assertEquals("getVersion", DataStoreVersions.POTASSIUM_VERSION, write.getVersion()); assertEquals("getPath", writePath, write.getPath()); assertEquals("getData", writeData, write.getData()); MergeModification merge = (MergeModification)clone.getModifications().get(1); + assertEquals("getVersion", DataStoreVersions.POTASSIUM_VERSION, merge.getVersion()); assertEquals("getPath", mergePath, merge.getPath()); assertEquals("getData", mergeData, merge.getData()); DeleteModification delete = (DeleteModification)clone.getModifications().get(2); + assertEquals("getVersion", DataStoreVersions.POTASSIUM_VERSION, delete.getVersion()); assertEquals("getPath", deletePath, delete.getPath()); } @Test - @Ignore - public void testSerializationScale() throws Exception { + public void testSerializationModern() { YangInstanceIdentifier writePath = TestModel.TEST_PATH; - NormalizedNode writeData = ImmutableContainerNodeBuilder.create().withNodeIdentifier( - new YangInstanceIdentifier.NodeIdentifier(TestModel.TEST_QNAME)). - withChild(ImmutableNodes.leafNode(TestModel.DESC_QNAME, "foo")).build(); + ContainerNode writeData = Builders.containerBuilder() + .withNodeIdentifier(new NodeIdentifier(TestModel.TEST_QNAME)) + .withChild(ImmutableNodes.leafNode(TestModel.DESC_QNAME, "foo")) + .build(); - MutableCompositeModification compositeModification = new MutableCompositeModification(); - for(int i = 0; i < 1000; i++) { - compositeModification.addModification(new WriteModification(writePath, writeData)); - } - - Stopwatch sw = Stopwatch.createStarted(); - for(int i = 0; i < 1000; i++) { - new ModificationPayload(compositeModification); - } - - sw.stop(); - System.out.println("Elapsed: "+sw); - - ModificationPayload p = new ModificationPayload(compositeModification); - sw.start(); - for(int i = 0; i < 1000; i++) { - p.getModification(); - } - - sw.stop(); - System.out.println("Elapsed: "+sw); + YangInstanceIdentifier mergePath = TestModel.OUTER_LIST_PATH; + ContainerNode mergeData = Builders.containerBuilder() + .withNodeIdentifier(new NodeIdentifier(TestModel.OUTER_LIST_QNAME)) + .build(); + + YangInstanceIdentifier deletePath = TestModel.TEST_PATH; + + MutableCompositeModification compositeModification = + new MutableCompositeModification(); + compositeModification.addModification(new WriteModification(writePath, writeData)); + compositeModification.addModification(new MergeModification(mergePath, mergeData)); + compositeModification.addModification(new DeleteModification(deletePath)); + + final byte[] bytes = SerializationUtils.serialize(compositeModification); + assertEquals(360, bytes.length); + MutableCompositeModification clone = (MutableCompositeModification) SerializationUtils.deserialize(bytes); + + assertEquals("getVersion", DataStoreVersions.CURRENT_VERSION, clone.getVersion()); + + assertEquals("getModifications size", 3, clone.getModifications().size()); + + WriteModification write = (WriteModification)clone.getModifications().get(0); + assertEquals("getVersion", DataStoreVersions.CURRENT_VERSION, write.getVersion()); + assertEquals("getPath", writePath, write.getPath()); + assertEquals("getData", writeData, write.getData()); + + MergeModification merge = (MergeModification)clone.getModifications().get(1); + assertEquals("getVersion", DataStoreVersions.CURRENT_VERSION, merge.getVersion()); + assertEquals("getPath", mergePath, merge.getPath()); + assertEquals("getData", mergeData, merge.getData()); + + DeleteModification delete = (DeleteModification)clone.getModifications().get(2); + assertEquals("getVersion", DataStoreVersions.CURRENT_VERSION, delete.getVersion()); + assertEquals("getPath", deletePath, delete.getPath()); } }