Code Review / yangtools.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Reduce use of getChildByName()
[yangtools.git] / yang / yang-data-impl / src / test / java / org / opendaylight / yangtools / yang / data / impl / leafref / context / DataTreeCandidateValidatorTest2.java
diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/DataTreeCandidateValidatorTest2.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/DataTreeCandidateValidatorTest2.java
index 134870db5b0f38a0847d3ea634c08f29b7552e2a..4450c8ae2c2cd12f2a2b7fde96506e32ea172573 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/DataTreeCandidateValidatorTest2.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/DataTreeCandidateValidatorTest2.java
@@ -12,6 +12,7 @@ import static org.junit.Assert.assertTrue;
 
 import java.util.Set;
 import org.apache.log4j.BasicConfigurator;
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.common.QName;
@@ -29,11 +30,11 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeConfiguratio
 import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification;
 import org.opendaylight.yangtools.yang.data.impl.leafref.LeafRefContext;
 import org.opendaylight.yangtools.yang.data.impl.leafref.LeafRefDataValidationFailedException;
-import org.opendaylight.yangtools.yang.data.impl.leafref.LeafRefValidatation;
+import org.opendaylight.yangtools.yang.data.impl.leafref.LeafRefValidation;
 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.api.CollectionNodeBuilder;
-import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeAttrBuilder;
+import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder;
 import org.opendaylight.yangtools.yang.data.impl.schema.tree.InMemoryDataTreeFactory;
 import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;
@@ -78,10 +79,62 @@ public class DataTreeCandidateValidatorTest2 {
 
     @BeforeClass
     public static void init() {
-        initSchemaContext();
-        initLeafRefContext();
-        initQnames();
-        initDataTree();
+        context = YangParserTestUtils.parseYangResourceDirectory("/leafref-validation");
+
+        final Set<Module> modules = context.getModules();
+        for (final Module module : modules) {
+            if (module.getName().equals("leafref-validation2")) {
+                mainModule = module;
+            }
+        }
+
+        rootModuleQname = mainModule.getQNameModule();
+        rootLeafRefContext = LeafRefContext.create(context);
+
+        chips = QName.create(rootModuleQname, "chips");
+        chip = QName.create(rootModuleQname, "chip");
+        devType = QName.create(rootModuleQname, "dev_type");
+        chipDesc = QName.create(rootModuleQname, "chip_desc");
+
+        devices = QName.create(rootModuleQname, "devices");
+        device = QName.create(rootModuleQname, "device");
+        typeText = QName.create(rootModuleQname, "type_text");
+        devDesc = QName.create(rootModuleQname, "dev_desc");
+        sn = QName.create(rootModuleQname, "sn");
+        defaultIp = QName.create(rootModuleQname, "default_ip");
+
+        deviceTypeStr = QName.create(rootModuleQname, "device_types");
+        deviceType = QName.create(rootModuleQname, "device_type");
+        type = QName.create(rootModuleQname, "type");
+        desc = QName.create(rootModuleQname, "desc");
+
+        inMemoryDataTree = new InMemoryDataTreeFactory().create(DataTreeConfiguration.DEFAULT_OPERATIONAL, context);
+        final DataTreeModification initialDataTreeModification = inMemoryDataTree.takeSnapshot().newModification();
+        final ContainerSchemaNode chipsListContSchemaNode = (ContainerSchemaNode) mainModule.findDataChildByName(chips)
+                .get();
+        final ContainerNode chipsContainer = createChipsContainer(chipsListContSchemaNode);
+        final YangInstanceIdentifier path1 = YangInstanceIdentifier.of(chips);
+        initialDataTreeModification.write(path1, chipsContainer);
+
+        final ContainerSchemaNode devTypesListContSchemaNode = (ContainerSchemaNode) mainModule
+                .findDataChildByName(deviceTypeStr).get();
+        final ContainerNode deviceTypesContainer = createDevTypeStrContainer(devTypesListContSchemaNode);
+        final YangInstanceIdentifier path2 = YangInstanceIdentifier.of(deviceTypeStr);
+        initialDataTreeModification.write(path2, deviceTypesContainer);
+
+        initialDataTreeModification.ready();
+        final DataTreeCandidate writeChipsCandidate = inMemoryDataTree.prepare(initialDataTreeModification);
+
+        inMemoryDataTree.commit(writeChipsCandidate);
+        LOG.debug("{}", inMemoryDataTree);
+    }
+
+    @AfterClass
+    public static void cleanup() {
+        inMemoryDataTree = null;
+        rootLeafRefContext = null;
+        mainModule = null;
+        context = null;
     }
 
     @Test
@@ -92,7 +145,8 @@ public class DataTreeCandidateValidatorTest2 {
 
     private static void writeDevices() {
 
-        final ContainerSchemaNode devicesContSchemaNode = (ContainerSchemaNode) mainModule.getDataChildByName(devices);
+        final ContainerSchemaNode devicesContSchemaNode = (ContainerSchemaNode) mainModule.findDataChildByName(devices)
+                .get();
 
         final ContainerNode devicesContainer = createDevicesContainer(devicesContSchemaNode);
 
@@ -110,7 +164,7 @@ public class DataTreeCandidateValidatorTest2 {
 
         boolean exception = false;
         try {
-            LeafRefValidatation.validate(writeDevicesCandidate, rootLeafRefContext);
+            LeafRefValidation.validate(writeDevicesCandidate, rootLeafRefContext);
         } catch (final LeafRefDataValidationFailedException e) {
             LOG.debug("All validation errors:{}{}", NEW_LINE, e.getMessage());
 
@@ -128,73 +182,11 @@ public class DataTreeCandidateValidatorTest2 {
         LOG.debug("{}", inMemoryDataTree);
     }
 
-    private static void initQnames() {
-
-        chips = QName.create(rootModuleQname, "chips");
-        chip = QName.create(rootModuleQname, "chip");
-        devType = QName.create(rootModuleQname, "dev_type");
-        chipDesc = QName.create(rootModuleQname, "chip_desc");
-
-        devices = QName.create(rootModuleQname, "devices");
-        device = QName.create(rootModuleQname, "device");
-        typeText = QName.create(rootModuleQname, "type_text");
-        devDesc = QName.create(rootModuleQname, "dev_desc");
-        sn = QName.create(rootModuleQname, "sn");
-        defaultIp = QName.create(rootModuleQname, "default_ip");
-
-        deviceTypeStr = QName.create(rootModuleQname, "device_types");
-        deviceType = QName.create(rootModuleQname, "device_type");
-        type = QName.create(rootModuleQname, "type");
-        desc = QName.create(rootModuleQname, "desc");
-    }
-
-    private static void initSchemaContext() {
-        context = YangParserTestUtils.parseYangResourceDirectory("/leafref-validation");
-
-        final Set<Module> modules = context.getModules();
-        for (final Module module : modules) {
-            if (module.getName().equals("leafref-validation2")) {
-                mainModule = module;
-            }
-        }
-
-        rootModuleQname = mainModule.getQNameModule();
-    }
-
-    private static void initDataTree() {
-
-        inMemoryDataTree = new InMemoryDataTreeFactory().create(DataTreeConfiguration.DEFAULT_OPERATIONAL, context);
-
-        final DataTreeModification initialDataTreeModification = inMemoryDataTree.takeSnapshot().newModification();
-
-        final ContainerSchemaNode chipsListContSchemaNode = (ContainerSchemaNode) mainModule.getDataChildByName(chips);
-        final ContainerNode chipsContainer = createChipsContainer(chipsListContSchemaNode);
-        final YangInstanceIdentifier path1 = YangInstanceIdentifier.of(chips);
-        initialDataTreeModification.write(path1, chipsContainer);
-
-        final ContainerSchemaNode devTypesListContSchemaNode = (ContainerSchemaNode) mainModule
-                .getDataChildByName(deviceTypeStr);
-        final ContainerNode deviceTypesContainer = createDevTypeStrContainer(devTypesListContSchemaNode);
-        final YangInstanceIdentifier path2 = YangInstanceIdentifier.of(deviceTypeStr);
-        initialDataTreeModification.write(path2, deviceTypesContainer);
-
-        initialDataTreeModification.ready();
-        final DataTreeCandidate writeChipsCandidate = inMemoryDataTree.prepare(initialDataTreeModification);
-
-        inMemoryDataTree.commit(writeChipsCandidate);
-
-        LOG.debug("{}", inMemoryDataTree);
-    }
-
-    private static void initLeafRefContext() {
-        rootLeafRefContext = LeafRefContext.create(context);
-    }
-
     private static ContainerNode createDevTypeStrContainer(final ContainerSchemaNode container) {
 
-        final ListSchemaNode devTypeListSchemaNode = (ListSchemaNode) container.getDataChildByName(deviceType);
+        final ListSchemaNode devTypeListSchemaNode = (ListSchemaNode) container.findDataChildByName(deviceType).get();
 
-        final DataContainerNodeAttrBuilder<NodeIdentifier, ContainerNode> devTypeContainerBldr = Builders
+        final DataContainerNodeBuilder<NodeIdentifier, ContainerNode> devTypeContainerBldr = Builders
                 .containerBuilder(container);
 
         final MapNode devTypeMap = createDevTypeList(devTypeListSchemaNode);
@@ -220,7 +212,7 @@ public class DataTreeCandidateValidatorTest2 {
         final LeafNode<String> typeLeaf = ImmutableNodes.leafNode(type, typeVal);
         final LeafNode<String> descLeaf = ImmutableNodes.leafNode(desc, descVal);
 
-        final DataContainerNodeAttrBuilder<NodeIdentifierWithPredicates, MapEntryNode> devTypeMapEntryBldr = Builders
+        final DataContainerNodeBuilder<NodeIdentifierWithPredicates, MapEntryNode> devTypeMapEntryBldr = Builders
                 .mapEntryBuilder(devTypeListSchemaNode);
 
         devTypeMapEntryBldr.addChild(typeLeaf);
@@ -231,9 +223,9 @@ public class DataTreeCandidateValidatorTest2 {
 
     private static ContainerNode createChipsContainer(final ContainerSchemaNode container) {
 
-        final ListSchemaNode chipsListSchemaNode = (ListSchemaNode) container.getDataChildByName(chip);
+        final ListSchemaNode chipsListSchemaNode = (ListSchemaNode) container.findDataChildByName(chip).get();
 
-        final DataContainerNodeAttrBuilder<NodeIdentifier, ContainerNode> chipsContainerBldr = Builders
+        final DataContainerNodeBuilder<NodeIdentifier, ContainerNode> chipsContainerBldr = Builders
                 .containerBuilder(container);
 
         final MapNode chipsMap = createChipsList(chipsListSchemaNode);
@@ -258,7 +250,7 @@ public class DataTreeCandidateValidatorTest2 {
         final LeafNode<String> devTypeLeaf = ImmutableNodes.leafNode(devType, devTypeVal);
         final LeafNode<String> chipDescLeaf = ImmutableNodes.leafNode(chipDesc, chipDescVal);
 
-        final DataContainerNodeAttrBuilder<NodeIdentifierWithPredicates, MapEntryNode> chipsMapEntryBldr = Builders
+        final DataContainerNodeBuilder<NodeIdentifierWithPredicates, MapEntryNode> chipsMapEntryBldr = Builders
                 .mapEntryBuilder(chipsListSchemaNode);
 
         chipsMapEntryBldr.addChild(devTypeLeaf);
@@ -269,9 +261,9 @@ public class DataTreeCandidateValidatorTest2 {
 
     private static ContainerNode createDevicesContainer(final ContainerSchemaNode container) {
 
-        final ListSchemaNode devicesListSchemaNode = (ListSchemaNode) container.getDataChildByName(device);
+        final ListSchemaNode devicesListSchemaNode = (ListSchemaNode) container.findDataChildByName(device).get();
 
-        final DataContainerNodeAttrBuilder<NodeIdentifier, ContainerNode> devicesContainerBldr = Builders
+        final DataContainerNodeBuilder<NodeIdentifier, ContainerNode> devicesContainerBldr = Builders
                 .containerBuilder(container);
 
         final MapNode devicesMap = createDeviceList(devicesListSchemaNode);
@@ -306,7 +298,7 @@ public class DataTreeCandidateValidatorTest2 {
         final LeafNode<Integer> snValLeaf = ImmutableNodes.leafNode(sn, snVal);
         final LeafNode<String> defaultIpLeaf = ImmutableNodes.leafNode(defaultIp, defaultIpVal);
 
-        final DataContainerNodeAttrBuilder<NodeIdentifierWithPredicates, MapEntryNode> devicesMapEntryBldr = Builders
+        final DataContainerNodeBuilder<NodeIdentifierWithPredicates, MapEntryNode> devicesMapEntryBldr = Builders
                 .mapEntryBuilder(devicesListSchemaNode);
 
         devicesMapEntryBldr.addChild(typeTextLeaf);
OpenDaylight YANG Tools