Reduce use of getDataChildByName()

Using findDataChildByName() is null-safe, allowing us to reduce
the number of assertions.

Change-Id: I182f52371aab5b18d94bebcd3a9aaf26b9d5fb55
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 0cfe4657be10a1a64de16f9bc29c8b1b9ee79555)

diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/TypeProviderIntegrationTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/TypeProviderIntegrationTest.java
index c40acf5ed8b6a2e129472064d6a495465e4a6e76..b7ff55345aa0a2c662eacf318d3374d3809ad711 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/TypeProviderIntegrationTest.java
+++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/TypeProviderIntegrationTest.java
@@ -54,12 +54,12 @@ public class TypeProviderIntegrationTest {
     @Test
     public void testGetTypeDefaultConstructionBinary() {
         final QName leafNode1 = QName.create(module.getQNameModule(), "leaf-binary");
-        LeafSchemaNode leaf = (LeafSchemaNode) module.getDataChildByName(leafNode1);
+        LeafSchemaNode leaf = (LeafSchemaNode) module.findDataChildByName(leafNode1).get();
         String actual = provider.getTypeDefaultConstruction(leaf);
         assertEquals("new byte[] {77, 97, 110}", actual);
 
         final QName leafNode2 = QName.create(module.getQNameModule(), "ext-binary");
-        leaf = (LeafSchemaNode) module.getDataChildByName(leafNode2);
+        leaf = (LeafSchemaNode) module.findDataChildByName(leafNode2).get();
         actual = provider.getTypeDefaultConstruction(leaf);
         assertEquals("new " + PKG + "MyBinary(new byte[] {77, 97, 110})", actual);
     }
@@ -67,12 +67,12 @@ public class TypeProviderIntegrationTest {
     @Test
     public void testGetTypeDefaultConstructionBits() {
         final QName leafNode1 = QName.create(module.getQNameModule(), "leaf-bits");
-        LeafSchemaNode leaf = (LeafSchemaNode) module.getDataChildByName(leafNode1);
+        LeafSchemaNode leaf = (LeafSchemaNode) module.findDataChildByName(leafNode1).get();
         String actual = provider.getTypeDefaultConstruction(leaf);
         assertEquals("new " + PKG + "TestData.LeafBits(false, false, true)", actual);
 
         final QName leafNode2 = QName.create(module.getQNameModule(), "ext-bits");
-        leaf = (LeafSchemaNode) module.getDataChildByName(leafNode2);
+        leaf = (LeafSchemaNode) module.findDataChildByName(leafNode2).get();
         actual = provider.getTypeDefaultConstruction(leaf);
         assertEquals("new " + PKG + "MyBits(false, false, true)", actual);
     }
@@ -80,12 +80,12 @@ public class TypeProviderIntegrationTest {
     @Test
     public void testGetTypeDefaultConstructionBoolean() {
         final QName leafNode1 = QName.create(module.getQNameModule(), "leaf-boolean");
-        LeafSchemaNode leaf = (LeafSchemaNode) module.getDataChildByName(leafNode1);
+        LeafSchemaNode leaf = (LeafSchemaNode) module.findDataChildByName(leafNode1).get();
         String actual = provider.getTypeDefaultConstruction(leaf);
         assertEquals("java.lang.Boolean.TRUE", actual);
 
         final QName leafNode2 = QName.create(module.getQNameModule(), "ext-boolean");
-        leaf = (LeafSchemaNode) module.getDataChildByName(leafNode2);
+        leaf = (LeafSchemaNode) module.findDataChildByName(leafNode2).get();
         actual = provider.getTypeDefaultConstruction(leaf);
         assertEquals("new " + PKG + "MyBoolean(java.lang.Boolean.TRUE)", actual);
     }
@@ -93,12 +93,12 @@ public class TypeProviderIntegrationTest {
     @Test
     public void testGetTypeDefaultConstructionDecimal() {
         final QName leafNode1 = QName.create(module.getQNameModule(), "leaf-decimal64");
-        LeafSchemaNode leaf = (LeafSchemaNode) module.getDataChildByName(leafNode1);
+        LeafSchemaNode leaf = (LeafSchemaNode) module.findDataChildByName(leafNode1).get();
         String actual = provider.getTypeDefaultConstruction(leaf);
         assertEquals("new java.math.BigDecimal(\"3.14\")", actual);
 
         final QName leafNode2 = QName.create(module.getQNameModule(), "ext-decimal64");
-        leaf = (LeafSchemaNode) module.getDataChildByName(leafNode2);
+        leaf = (LeafSchemaNode) module.findDataChildByName(leafNode2).get();
         actual = provider.getTypeDefaultConstruction(leaf);
         assertEquals("new " + PKG + "MyDecimal64(new java.math.BigDecimal(\"3.14\"))", actual);
     }
@@ -106,12 +106,12 @@ public class TypeProviderIntegrationTest {
     @Test
     public void testGetTypeDefaultConstructionEmpty() {
         final QName leafNode1 = QName.create(module.getQNameModule(), "leaf-empty");
-        LeafSchemaNode leaf = (LeafSchemaNode) module.getDataChildByName(leafNode1);
+        LeafSchemaNode leaf = (LeafSchemaNode) module.findDataChildByName(leafNode1).get();
         String actual = provider.getTypeDefaultConstruction(leaf);
         assertEquals("java.lang.Boolean.FALSE", actual);
 
         final QName leafNode2 = QName.create(module.getQNameModule(), "ext-empty");
-        leaf = (LeafSchemaNode) module.getDataChildByName(leafNode2);
+        leaf = (LeafSchemaNode) module.findDataChildByName(leafNode2).get();
         actual = provider.getTypeDefaultConstruction(leaf);
         assertEquals("new " + PKG + "MyEmpty(java.lang.Boolean.FALSE)", actual);
     }
@@ -119,12 +119,12 @@ public class TypeProviderIntegrationTest {
     @Test
     public void testGetTypeDefaultConstructionEnumeration() {
         final QName leafNode1 = QName.create(module.getQNameModule(), "leaf-enumeration");
-        LeafSchemaNode leaf = (LeafSchemaNode) module.getDataChildByName(leafNode1);
+        LeafSchemaNode leaf = (LeafSchemaNode) module.findDataChildByName(leafNode1).get();
         String actual = provider.getTypeDefaultConstruction(leaf);
         assertEquals("org.opendaylight.yang.gen.v1.urn.opendaylight.test.rev131008.LeafEnumeration.Seven", actual);
 
         final QName leafNode2 = QName.create(module.getQNameModule(), "ext-enumeration");
-        leaf = (LeafSchemaNode) module.getDataChildByName(leafNode2);
+        leaf = (LeafSchemaNode) module.findDataChildByName(leafNode2).get();
         actual = provider.getTypeDefaultConstruction(leaf);
         assertEquals(PKG + "MyEnumeration.Seven", actual);
     }
@@ -132,12 +132,12 @@ public class TypeProviderIntegrationTest {
     @Test
     public void testGetTypeDefaultConstructionInt8() {
         final QName leafNode1 = QName.create(module.getQNameModule(), "leaf-int8");
-        LeafSchemaNode leaf = (LeafSchemaNode) module.getDataChildByName(leafNode1);
+        LeafSchemaNode leaf = (LeafSchemaNode) module.findDataChildByName(leafNode1).get();
         String actual = provider.getTypeDefaultConstruction(leaf);
         assertEquals("java.lang.Byte.valueOf(\"11\")", actual);
 
         final QName leafNode2 = QName.create(module.getQNameModule(), "ext-int8");
-        leaf = (LeafSchemaNode) module.getDataChildByName(leafNode2);
+        leaf = (LeafSchemaNode) module.findDataChildByName(leafNode2).get();
         actual = provider.getTypeDefaultConstruction(leaf);
         assertEquals("new " + PKG + "MyInt8(java.lang.Byte.valueOf(\"11\"))", actual);
     }
@@ -145,12 +145,12 @@ public class TypeProviderIntegrationTest {
     @Test
     public void testGetTypeDefaultConstructionInt16() {
         final QName leafNode1 = QName.create(module.getQNameModule(), "leaf-int16");
-        LeafSchemaNode leaf = (LeafSchemaNode) module.getDataChildByName(leafNode1);
+        LeafSchemaNode leaf = (LeafSchemaNode) module.findDataChildByName(leafNode1).get();
         String actual = provider.getTypeDefaultConstruction(leaf);
         assertEquals("java.lang.Short.valueOf(\"111\")", actual);
 
         final QName leafNode2 = QName.create(module.getQNameModule(), "ext-int16");
-        leaf = (LeafSchemaNode) module.getDataChildByName(leafNode2);
+        leaf = (LeafSchemaNode) module.findDataChildByName(leafNode2).get();
         actual = provider.getTypeDefaultConstruction(leaf);
         assertEquals("new " + PKG + "MyInt16(java.lang.Short.valueOf(\"111\"))", actual);
     }
@@ -158,12 +158,12 @@ public class TypeProviderIntegrationTest {
     @Test
     public void testGetTypeDefaultConstructionInt32() {
         final QName leafNode1 = QName.create(module.getQNameModule(), "leaf-int32");
-        LeafSchemaNode leaf = (LeafSchemaNode) module.getDataChildByName(leafNode1);
+        LeafSchemaNode leaf = (LeafSchemaNode) module.findDataChildByName(leafNode1).get();
         String actual = provider.getTypeDefaultConstruction(leaf);
         assertEquals("java.lang.Integer.valueOf(\"1111\")", actual);
 
         final QName leafNode2 = QName.create(module.getQNameModule(), "ext-int32");
-        leaf = (LeafSchemaNode) module.getDataChildByName(leafNode2);
+        leaf = (LeafSchemaNode) module.findDataChildByName(leafNode2).get();
         actual = provider.getTypeDefaultConstruction(leaf);
         assertEquals("new " + PKG + "MyInt32(java.lang.Integer.valueOf(\"1111\"))", actual);
     }
@@ -171,12 +171,12 @@ public class TypeProviderIntegrationTest {
     @Test
     public void testGetTypeDefaultConstructionInt64() {
         final QName leafNode1 = QName.create(module.getQNameModule(), "leaf-int64");
-        LeafSchemaNode leaf = (LeafSchemaNode) module.getDataChildByName(leafNode1);
+        LeafSchemaNode leaf = (LeafSchemaNode) module.findDataChildByName(leafNode1).get();
         String actual = provider.getTypeDefaultConstruction(leaf);
         assertEquals("java.lang.Long.valueOf(\"11111\")", actual);
 
         final QName leafNode2 = QName.create(module.getQNameModule(), "ext-int64");
-        leaf = (LeafSchemaNode) module.getDataChildByName(leafNode2);
+        leaf = (LeafSchemaNode) module.findDataChildByName(leafNode2).get();
         actual = provider.getTypeDefaultConstruction(leaf);
         assertEquals("new " + PKG + "MyInt64(java.lang.Long.valueOf(\"11111\"))", actual);
     }
@@ -184,12 +184,12 @@ public class TypeProviderIntegrationTest {
     @Test
     public void testGetTypeDefaultConstructionLeafref1() {
         final QName leafNode1 = QName.create(module.getQNameModule(), "leaf-leafref");
-        LeafSchemaNode leaf = (LeafSchemaNode) module.getDataChildByName(leafNode1);
+        LeafSchemaNode leaf = (LeafSchemaNode) module.findDataChildByName(leafNode1).get();
         String actual = provider.getTypeDefaultConstruction(leaf);
         assertEquals("new java.math.BigDecimal(\"1.234\")", actual);
 
         final QName leafNode2 = QName.create(module.getQNameModule(), "ext-leafref");
-        leaf = (LeafSchemaNode) module.getDataChildByName(leafNode2);
+        leaf = (LeafSchemaNode) module.findDataChildByName(leafNode2).get();
         actual = provider.getTypeDefaultConstruction(leaf);
         assertEquals("new java.math.BigDecimal(\"1.234\")", actual);
     }
@@ -197,12 +197,12 @@ public class TypeProviderIntegrationTest {
     @Test
     public void testGetTypeDefaultConstructionLeafref2() {
         final QName leafNode1 = QName.create(module.getQNameModule(), "leaf-leafref1");
-        LeafSchemaNode leaf = (LeafSchemaNode) module.getDataChildByName(leafNode1);
+        LeafSchemaNode leaf = (LeafSchemaNode) module.findDataChildByName(leafNode1).get();
         String actual = provider.getTypeDefaultConstruction(leaf);
         assertEquals("new " + PKG + "MyBinary(new byte[] {77, 97, 110})", actual);
 
         final QName leafNode2 = QName.create(module.getQNameModule(), "ext-leafref1");
-        leaf = (LeafSchemaNode) module.getDataChildByName(leafNode2);
+        leaf = (LeafSchemaNode) module.findDataChildByName(leafNode2).get();
         actual = provider.getTypeDefaultConstruction(leaf);
         assertEquals("new " + PKG + "MyBinary(new byte[] {77, 97, 110})", actual);
     }
@@ -210,12 +210,12 @@ public class TypeProviderIntegrationTest {
     @Test
     public void testGetTypeDefaultConstructionString() {
         final QName leafNode1 = QName.create(module.getQNameModule(), "leaf-string");
-        LeafSchemaNode leaf = (LeafSchemaNode) module.getDataChildByName(leafNode1);
+        LeafSchemaNode leaf = (LeafSchemaNode) module.findDataChildByName(leafNode1).get();
         String actual = provider.getTypeDefaultConstruction(leaf);
         assertEquals("\"name\"", actual);
 
         final QName leafNode2 = QName.create(module.getQNameModule(), "ext-string");
-        leaf = (LeafSchemaNode) module.getDataChildByName(leafNode2);
+        leaf = (LeafSchemaNode) module.findDataChildByName(leafNode2).get();
         actual = provider.getTypeDefaultConstruction(leaf);
         assertEquals("new " + PKG + "MyString(\"name\")", actual);
     }
@@ -223,12 +223,12 @@ public class TypeProviderIntegrationTest {
     @Test
     public void testGetTypeDefaultConstructionUint8() {
         final QName leafNode1 = QName.create(module.getQNameModule(), "leaf-uint8");
-        LeafSchemaNode leaf = (LeafSchemaNode) module.getDataChildByName(leafNode1);
+        LeafSchemaNode leaf = (LeafSchemaNode) module.findDataChildByName(leafNode1).get();
         String actual = provider.getTypeDefaultConstruction(leaf);
         assertEquals("java.lang.Short.valueOf(\"11\")", actual);
 
         final QName leafNode2 = QName.create(module.getQNameModule(), "ext-uint8");
-        leaf = (LeafSchemaNode) module.getDataChildByName(leafNode2);
+        leaf = (LeafSchemaNode) module.findDataChildByName(leafNode2).get();
         actual = provider.getTypeDefaultConstruction(leaf);
         assertEquals("new " + PKG + "MyUint8(java.lang.Short.valueOf(\"11\"))", actual);
     }
@@ -236,12 +236,12 @@ public class TypeProviderIntegrationTest {
     @Test
     public void testGetTypeDefaultConstructionUint16() {
         final QName leafNode1 = QName.create(module.getQNameModule(), "leaf-uint16");
-        LeafSchemaNode leaf = (LeafSchemaNode) module.getDataChildByName(leafNode1);
+        LeafSchemaNode leaf = (LeafSchemaNode) module.findDataChildByName(leafNode1).get();
         String actual = provider.getTypeDefaultConstruction(leaf);
         assertEquals("java.lang.Integer.valueOf(\"111\")", actual);
 
         final QName leafNode2 = QName.create(module.getQNameModule(), "ext-uint16");
-        leaf = (LeafSchemaNode) module.getDataChildByName(leafNode2);
+        leaf = (LeafSchemaNode) module.findDataChildByName(leafNode2).get();
         actual = provider.getTypeDefaultConstruction(leaf);
         assertEquals("new " + PKG + "MyUint16(java.lang.Integer.valueOf(\"111\"))", actual);
     }
@@ -249,12 +249,12 @@ public class TypeProviderIntegrationTest {
     @Test
     public void testGetTypeDefaultConstructionUint32() {
         final QName leafNode1 = QName.create(module.getQNameModule(), "leaf-uint32");
-        LeafSchemaNode leaf = (LeafSchemaNode) module.getDataChildByName(leafNode1);
+        LeafSchemaNode leaf = (LeafSchemaNode) module.findDataChildByName(leafNode1).get();
         String actual = provider.getTypeDefaultConstruction(leaf);
         assertEquals("java.lang.Long.valueOf(\"1111\")", actual);
 
         final QName leafNode2 = QName.create(module.getQNameModule(), "ext-uint32");
-        leaf = (LeafSchemaNode) module.getDataChildByName(leafNode2);
+        leaf = (LeafSchemaNode) module.findDataChildByName(leafNode2).get();
         actual = provider.getTypeDefaultConstruction(leaf);
         assertEquals("new " + PKG + "MyUint32(java.lang.Long.valueOf(\"1111\"))", actual);
     }
@@ -262,12 +262,12 @@ public class TypeProviderIntegrationTest {
     @Test
     public void testGetTypeDefaultConstructionUint64() {
         final QName leafNode1 = QName.create(module.getQNameModule(), "leaf-uint64");
-        LeafSchemaNode leaf = (LeafSchemaNode) module.getDataChildByName(leafNode1);
+        LeafSchemaNode leaf = (LeafSchemaNode) module.findDataChildByName(leafNode1).get();
         String actual = provider.getTypeDefaultConstruction(leaf);
         assertEquals("new java.math.BigInteger(\"11111\")", actual);
 
         final QName leafNode2 = QName.create(module.getQNameModule(), "ext-uint64");
-        leaf = (LeafSchemaNode) module.getDataChildByName(leafNode2);
+        leaf = (LeafSchemaNode) module.findDataChildByName(leafNode2).get();
         actual = provider.getTypeDefaultConstruction(leaf);
         assertEquals("new " + PKG + "MyUint64(new java.math.BigInteger(\"11111\"))", actual);
     }
@@ -275,7 +275,7 @@ public class TypeProviderIntegrationTest {
     @Test
     public void testGetTypeDefaultConstruction() {
         final QName leafNode = QName.create(module.getQNameModule(), "ip-leaf");
-        LeafSchemaNode leaf = (LeafSchemaNode) module.getDataChildByName(leafNode);
+        LeafSchemaNode leaf = (LeafSchemaNode) module.findDataChildByName(leafNode).get();
         String actual = provider.getTypeDefaultConstruction(leaf);
         String exp = "new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924."
                 + "Ipv4Address(\"0.0.0.1\")";
@@ -285,13 +285,13 @@ public class TypeProviderIntegrationTest {
     @Test
     public void testGetTypeDefaultConstructionUnion() {
         final QName leafNode1 = QName.create(module.getQNameModule(), "leaf-union");
-        LeafSchemaNode leaf = (LeafSchemaNode) module.getDataChildByName(leafNode1);
+        LeafSchemaNode leaf = (LeafSchemaNode) module.findDataChildByName(leafNode1).get();
         String actual = provider.getTypeDefaultConstruction(leaf);
         String expected = "new " + PKG + "TestData.LeafUnion(\"111\".toCharArray())";
         assertEquals(expected, actual);
 
         final QName leafNode2 = QName.create(module.getQNameModule(), "ext-union");
-        leaf = (LeafSchemaNode) module.getDataChildByName(leafNode2);
+        leaf = (LeafSchemaNode) module.findDataChildByName(leafNode2).get();
         actual = provider.getTypeDefaultConstruction(leaf);
         expected = "new " + PKG + "MyUnion(\"111\".toCharArray())";
         assertEquals(expected, actual);
@@ -300,13 +300,13 @@ public class TypeProviderIntegrationTest {
     @Test
     public void testGetTypeDefaultConstructionUnionNested()  {
         final QName containerNode1 = QName.create(module.getQNameModule(), "c1");
-        ContainerSchemaNode c1 = (ContainerSchemaNode) module.getDataChildByName(containerNode1);
+        ContainerSchemaNode c1 = (ContainerSchemaNode) module.findDataChildByName(containerNode1).get();
         final QName containerNode2 = QName.create(module.getQNameModule(), "c2");
-        ContainerSchemaNode c2 = (ContainerSchemaNode) c1.getDataChildByName(containerNode2);
+        ContainerSchemaNode c2 = (ContainerSchemaNode) c1.findDataChildByName(containerNode2).get();
         final QName containerNode3 = QName.create(module.getQNameModule(), "c3");
-        ContainerSchemaNode c3 = (ContainerSchemaNode) c2.getDataChildByName(containerNode3);
+        ContainerSchemaNode c3 = (ContainerSchemaNode) c2.findDataChildByName(containerNode3).get();
         final QName leafNode = QName.create(module.getQNameModule(), "id");
-        LeafSchemaNode leaf = (LeafSchemaNode) c3.getDataChildByName(leafNode);
+        LeafSchemaNode leaf = (LeafSchemaNode) c3.findDataChildByName(leafNode).get();
 
         String actual = provider.getTypeDefaultConstruction(leaf);
         String expected = "new " + PKG + "NestedUnion(\"111\".toCharArray())";

diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/TypeProviderTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/TypeProviderTest.java
index 72642e64900e525f5f7f737cc49e358887c2aa09..a376204a8c3e4e912868cb58109b020b6c7087b9 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/TypeProviderTest.java
+++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/TypeProviderTest.java
@@ -129,14 +129,12 @@ public class TypeProviderTest {
     private static LeafSchemaNode provideLeafNodeFromTopLevelContainer(final Module module, final String containerName,
             final String leafNodeName) {
         final QName containerNode = QName.create(module.getQNameModule(), containerName);
-        final DataSchemaNode rootNode = module.getDataChildByName(containerNode);
-        assertNotNull("Container foo is not present in root of module " + module.getName(), rootNode);
+        final DataSchemaNode rootNode = module.findDataChildByName(containerNode).get();
         assertTrue(rootNode instanceof DataNodeContainer);
 
         final QName leafNode = QName.create(module.getQNameModule(), leafNodeName);
         final DataNodeContainer rootContainer = (DataNodeContainer) rootNode;
-        final DataSchemaNode node = rootContainer.getDataChildByName(leafNode);
-        assertNotNull(node);
+        final DataSchemaNode node = rootContainer.findDataChildByName(leafNode).get();
         assertTrue(node instanceof LeafSchemaNode);
         return (LeafSchemaNode) node;
     }
@@ -144,14 +142,12 @@ public class TypeProviderTest {
     private static LeafListSchemaNode provideLeafListNodeFromTopLevelContainer(final Module module,
             final String containerName, final String leafListNodeName) {
         final QName containerNode = QName.create(module.getQNameModule(), containerName);
-        final DataSchemaNode rootNode = module.getDataChildByName(containerNode);
-        assertNotNull("Container foo is not present in root of module " + module.getName(), rootNode);
+        final DataSchemaNode rootNode = module.findDataChildByName(containerNode).get();
         assertTrue(rootNode instanceof DataNodeContainer);
 
         final DataNodeContainer rootContainer = (DataNodeContainer) rootNode;
         final QName leafListNode = QName.create(module.getQNameModule(), leafListNodeName);
-        final DataSchemaNode node = rootContainer.getDataChildByName(leafListNode);
-        assertNotNull(node);
+        final DataSchemaNode node = rootContainer.findDataChildByName(leafListNode).get();
         assertTrue(node instanceof LeafListSchemaNode);
         return (LeafListSchemaNode) node;
     }
@@ -286,7 +282,7 @@ public class TypeProviderTest {
 
         final Module module = resolveModule("test-type-provider-b");
         final QName leafNode = QName.create(module.getQNameModule(), "id");
-        final DataSchemaNode rootNode = module.getDataChildByName(leafNode);
+        final DataSchemaNode rootNode = module.findDataChildByName(leafNode).get();
         assertNotNull("leaf id is not present in root of module " + module.getName(), rootNode);
         assertTrue(rootNode instanceof LeafSchemaNode);
         leaf = (LeafSchemaNode) rootNode;
@@ -306,8 +302,7 @@ public class TypeProviderTest {
         final Module module = resolveModule("test-type-provider-b");
 
         final QName leafNode = QName.create(module.getQNameModule(), "enum");
-        final DataSchemaNode enumNode = module.getDataChildByName(leafNode);
-        assertNotNull("leaf enum is not present in root of module " + module.getName(), enumNode);
+        final DataSchemaNode enumNode = module.findDataChildByName(leafNode).get();
         assertTrue(enumNode instanceof LeafSchemaNode);
         final LeafSchemaNode leaf = (LeafSchemaNode) enumNode;
         final TypeDefinition<?> leafType = leaf.getType();
@@ -317,8 +312,7 @@ public class TypeProviderTest {
         assertTrue(leafrefResolvedType1 instanceof ReferencedTypeImpl);
 
         final QName leafListNode = QName.create(module.getQNameModule(), "enums");
-        final DataSchemaNode enumListNode = module.getDataChildByName(leafListNode);
-        assertNotNull("leaf-list enums is not present in root of module " + module.getName(), enumNode);
+        final DataSchemaNode enumListNode = module.findDataChildByName(leafListNode).get();
         assertTrue(enumListNode instanceof LeafListSchemaNode);
         final LeafListSchemaNode leafList = (LeafListSchemaNode) enumListNode;
         final TypeDefinition<?> leafListType = leafList.getType();
@@ -352,8 +346,7 @@ public class TypeProviderTest {
         final Module module = resolveModule("test-type-provider-b");
 
         final QName leafrefNode = QName.create(module.getQNameModule(), "conditional-leafref");
-        final DataSchemaNode condLeaf = module.getDataChildByName(leafrefNode);
-        assertNotNull("leaf conditional-leafref is not present in root of module " + module.getName(), condLeaf);
+        final DataSchemaNode condLeaf = module.findDataChildByName(leafrefNode).get();
         assertTrue(condLeaf instanceof LeafSchemaNode);
         final LeafSchemaNode leaf = (LeafSchemaNode) condLeaf;
         final TypeDefinition<?> leafType = leaf.getType();
@@ -371,8 +364,7 @@ public class TypeProviderTest {
         final Module module = resolveModule("test-type-provider-b");
 
         final QName leafrefNode = QName.create(module.getQNameModule(), "unreslovable-leafref");
-        final DataSchemaNode condLeaf = module.getDataChildByName(leafrefNode);
-        assertNotNull("leaf unreslovable-leafref is not present in root of module " + module.getName(), condLeaf);
+        final DataSchemaNode condLeaf = module.findDataChildByName(leafrefNode).get();
         assertTrue(condLeaf instanceof LeafSchemaNode);
         final LeafSchemaNode leaf = (LeafSchemaNode) condLeaf;
         final TypeDefinition<?> leafType = leaf.getType();
@@ -867,8 +859,7 @@ public class TypeProviderTest {
 
         final Module module = resolveModule("test-type-provider");
         final QName leafUnionNode = QName.create(module.getQNameModule(), "root-union-leaf");
-        DataSchemaNode rootNode = module.getDataChildByName(leafUnionNode);
-        assertNotNull("leaf root-union-leaf is not present in root of module " + module.getName(), rootNode);
+        DataSchemaNode rootNode = module.findDataChildByName(leafUnionNode).get();
         assertTrue(rootNode instanceof LeafSchemaNode);
         leaf = (LeafSchemaNode) rootNode;
         result = provider.getTypeDefaultConstruction(leaf);
@@ -885,8 +876,7 @@ public class TypeProviderTest {
                 + "YangBinary(new byte[] {-45, 23, -33, 125, -9, -33})", result);
 
         final QName leafBitsNode = QName.create(module.getQNameModule(), "root-bits-leaf");
-        rootNode = module.getDataChildByName(leafBitsNode);
-        assertNotNull("leaf bits-leaf is not present in root of module " + module.getName(), rootNode);
+        rootNode = module.findDataChildByName(leafBitsNode).get();
         assertTrue(rootNode instanceof LeafSchemaNode);
         leaf = (LeafSchemaNode) rootNode;
         result = provider.getTypeDefaultConstruction(leaf);