From: Robert Varga Date: Mon, 7 Dec 2020 09:24:48 +0000 (+0100) Subject: Migrate getDataChildByName() users X-Git-Tag: v6.0.3~4 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=yangtools.git;a=commitdiff_plain;h=bb60da5fe2d1928defb46ed92b290cfff93dcd81 Migrate getDataChildByName() users These users are using getDataChildByName() in its nullable capacity, migrate them to dataChildByName(). JIRA: YANGTOOLS-1183 Change-Id: Id2cdf95804b1faf6189863de9f96253ab459ed6c Signed-off-by: Robert Varga (cherry picked from commit a25a8add2e3b3a38cf76ab963da9a89ff5326a55) --- diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/SchemaTracker.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/SchemaTracker.java index aec921d926..c8d958449f 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/SchemaTracker.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/SchemaTracker.java @@ -136,7 +136,7 @@ public final class SchemaTracker { SchemaNode schema = null; final QName qname = name.getNodeType(); if (parent instanceof DataNodeContainer) { - schema = ((DataNodeContainer)parent).getDataChildByName(qname); + schema = ((DataNodeContainer)parent).dataChildByName(qname); if (schema == null) { if (parent instanceof GroupingDefinition) { schema = (GroupingDefinition) parent; diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefUtils.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefUtils.java index cd3d29643e..f17f766ed7 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefUtils.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefUtils.java @@ -63,7 +63,7 @@ public final class LeafRefUtils { DataNodeContainer currenDataNodeContainer = module; while (nodePathIterator.hasNext()) { final QName qname = nodePathIterator.next(); - final DataSchemaNode child = currenDataNodeContainer.getDataChildByName(qname); + final DataSchemaNode child = currenDataNodeContainer.dataChildByName(qname); if (child instanceof DataNodeContainer) { if (!(child instanceof CaseSchemaNode)) { diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ImmutableNodes.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ImmutableNodes.java index c734ee84f0..5a96515d13 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ImmutableNodes.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ImmutableNodes.java @@ -239,7 +239,7 @@ public final class ImmutableNodes { final Iterator it = id.getPathArguments().iterator(); if (it.hasNext()) { topLevelElement = it.next(); - final DataSchemaNode dataChildByName = ctx.getDataChildByName(topLevelElement.getNodeType()); + final DataSchemaNode dataChildByName = ctx.dataChildByName(topLevelElement.getNodeType()); checkNotNull(dataChildByName, "Cannot find %s node in schema context. Instance identifier has to start from root", topLevelElement); instanceIdToNodes = InstanceIdToNodes.fromSchemaAndQNameChecked(ctx, topLevelElement.getNodeType()); diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/SchemaOrderedNormalizedNodeWriter.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/SchemaOrderedNormalizedNodeWriter.java index 4f2c4a524c..6cb35a5dbb 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/SchemaOrderedNormalizedNodeWriter.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/SchemaOrderedNormalizedNodeWriter.java @@ -67,7 +67,7 @@ public class SchemaOrderedNormalizedNodeWriter extends NormalizedNodeWriter { @Override public SchemaOrderedNormalizedNodeWriter write(final NormalizedNode node) throws IOException { if (Objects.equals(root, schemaContext)) { - currentSchemaNode = schemaContext.getDataChildByName(node.getNodeType()); + currentSchemaNode = schemaContext.dataChildByName(node.getNodeType()); } else { currentSchemaNode = root; } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/SchemaUtils.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/SchemaUtils.java index 63a98c54a8..a93ff38ebd 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/SchemaUtils.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/SchemaUtils.java @@ -429,7 +429,7 @@ public final class SchemaUtils { */ public static @Nullable SchemaNode findDataChildSchemaByQName(final SchemaNode node, final QName qname) { if (node instanceof DataNodeContainer) { - SchemaNode child = ((DataNodeContainer) node).getDataChildByName(qname); + SchemaNode child = ((DataNodeContainer) node).dataChildByName(qname); if (child == null && node instanceof SchemaContext) { child = tryFind(((SchemaContext) node).getOperations(), qname).orElse(null); } diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/CompositeNodeDataWithSchema.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/CompositeNodeDataWithSchema.java index db16fbec44..8d6bf20a5d 100644 --- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/CompositeNodeDataWithSchema.java +++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/CompositeNodeDataWithSchema.java @@ -296,7 +296,7 @@ public class CompositeNodeDataWithSchema extends Abstr final DataSchemaNode child) { if (parent instanceof AugmentationTarget && !(parent instanceof ChoiceSchemaNode)) { for (AugmentationSchemaNode augmentation : ((AugmentationTarget) parent).getAvailableAugmentations()) { - DataSchemaNode childInAugmentation = augmentation.getDataChildByName(child.getQName()); + DataSchemaNode childInAugmentation = augmentation.dataChildByName(child.getQName()); if (childInAugmentation != null) { return augmentation; } diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/DataSchemaContextNode.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/DataSchemaContextNode.java index 216bf47860..8070db3c31 100644 --- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/DataSchemaContextNode.java +++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/DataSchemaContextNode.java @@ -102,7 +102,7 @@ public abstract class DataSchemaContextNode extends Abst } static DataSchemaNode findChildSchemaNode(final DataNodeContainer parent, final QName child) { - final DataSchemaNode potential = parent.getDataChildByName(child); + final DataSchemaNode potential = parent.dataChildByName(child); return potential == null ? findChoice(Iterables.filter(parent.getChildNodes(), ChoiceSchemaNode.class), child) : potential; } diff --git a/yang/yang-model-util-ut/src/test/java/org/opendaylight/yangtools/yang/model/util/ut/SchemaContextUtilTest.java b/yang/yang-model-util-ut/src/test/java/org/opendaylight/yangtools/yang/model/util/ut/SchemaContextUtilTest.java index 6b5d77e2bc..2eb2e64c97 100644 --- a/yang/yang-model-util-ut/src/test/java/org/opendaylight/yangtools/yang/model/util/ut/SchemaContextUtilTest.java +++ b/yang/yang-model-util-ut/src/test/java/org/opendaylight/yangtools/yang/model/util/ut/SchemaContextUtilTest.java @@ -159,94 +159,86 @@ public class SchemaContextUtilTest { @Test public void findNodeInSchemaContextTest2() { SchemaNode testNode = ((ContainerSchemaNode) myModule.getDataChildByName(QName.create( - myModule.getQNameModule(), "my-container"))).getDataChildByName(QName.create(myModule.getQNameModule(), + myModule.getQNameModule(), "my-container"))).dataChildByName(QName.create(myModule.getQNameModule(), "my-leaf-not-in-container")); + assertNull(testNode); SchemaPath path = SchemaPath.create(true, QName.create(myModule.getQNameModule(), "my-container"), QName.create(myModule.getQNameModule(), "my-leaf-not-in-container")); SchemaNode foundNode = SchemaContextUtil.findNodeInSchemaContext(context, path.getPathFromRoot()); - - assertNull(testNode); assertNull(foundNode); final RpcDefinition rpc = getRpcByName(myModule, "my-rpc"); - testNode = rpc.getInput().getDataChildByName(QName.create(myModule.getQNameModule(), "no-input-leaf")); + testNode = rpc.getInput().dataChildByName(QName.create(myModule.getQNameModule(), "no-input-leaf")); + assertNull(testNode); path = SchemaPath.create(true, QName.create(myModule.getQNameModule(), "my-rpc"), QName.create(myModule.getQNameModule(), "input"), QName.create(myModule.getQNameModule(), "no-input-leaf")); foundNode = SchemaContextUtil.findNodeInSchemaContext(context, path.getPathFromRoot()); - - assertNull(testNode); assertNull(foundNode); final NotificationDefinition notification = myModule.getNotifications().iterator().next(); - testNode = notification.getDataChildByName(QName.create(myModule.getQNameModule(), "no-notification-leaf")); + testNode = notification.dataChildByName(QName.create(myModule.getQNameModule(), "no-notification-leaf")); + assertNull(testNode); path = SchemaPath.create(true, QName.create(myModule.getQNameModule(), "my-notification"), QName.create(myModule.getQNameModule(), "no-notification-leaf")); foundNode = SchemaContextUtil.findNodeInSchemaContext(context, path.getPathFromRoot()); - - assertNull(testNode); assertNull(foundNode); final GroupingDefinition grouping = getGroupingByName(myModule, "my-grouping"); testNode = ((ContainerSchemaNode) grouping.getDataChildByName(QName.create(myModule.getQNameModule(), - "my-container-in-grouping"))).getDataChildByName(QName.create(myModule.getQNameModule(), + "my-container-in-grouping"))).dataChildByName(QName.create(myModule.getQNameModule(), "no-leaf-in-grouping")); + assertNull(testNode); path = SchemaPath.create(true, QName.create(myModule.getQNameModule(), "my-grouping"), QName.create(myModule.getQNameModule(), "my-container-in-grouping"), QName.create(myModule.getQNameModule(), "no-leaf-in-grouping")); foundNode = SchemaContextUtil.findNodeInSchemaContext(context, path.getPathFromRoot()); - - assertNull(testNode); assertNull(foundNode); testNode = ((ChoiceSchemaNode) myModule .getDataChildByName(QName.create(myModule.getQNameModule(), "my-choice"))) .findCaseNodes("one").iterator().next() - .getDataChildByName(QName.create(myModule.getQNameModule(), "no-choice-leaf")); + .dataChildByName(QName.create(myModule.getQNameModule(), "no-choice-leaf")); + assertNull(testNode); path = SchemaPath.create(true, QName.create(myModule.getQNameModule(), "my-choice"), QName.create(myModule.getQNameModule(), "one"), QName.create(myModule.getQNameModule(), "no-choice-leaf")); foundNode = SchemaContextUtil.findNodeInSchemaContext(context, path.getPathFromRoot()); - - assertNull(testNode); assertNull(foundNode); ListSchemaNode listNode = (ListSchemaNode) ((ContainerSchemaNode) myModule.getDataChildByName(QName.create( myModule.getQNameModule(), "my-container"))).getDataChildByName(QName.create(myModule.getQNameModule(), "my-list")); - testNode = listNode.getDataChildByName(QName.create(myModule.getQNameModule(), "no-leaf-in-list")); + testNode = listNode.dataChildByName(QName.create(myModule.getQNameModule(), "no-leaf-in-list")); + assertNull(testNode); path = SchemaPath.create(true, QName.create(myModule.getQNameModule(), "my-container"), QName.create(myModule.getQNameModule(), "my-list"), QName.create(myModule.getQNameModule(), "no-leaf-in-list")); foundNode = SchemaContextUtil.findNodeInSchemaContext(context, path.getPathFromRoot()); - - assertNull(testNode); assertNull(foundNode); listNode = (ListSchemaNode) ((ContainerSchemaNode) myModule.getDataChildByName(QName.create( myModule.getQNameModule(), "my-container"))).getDataChildByName(QName.create(myModule.getQNameModule(), "my-list")); - testNode = listNode.getDataChildByName(QName.create(myModule.getQNameModule(), "no-leaf-list-in-list")); + testNode = listNode.dataChildByName(QName.create(myModule.getQNameModule(), "no-leaf-list-in-list")); + assertNull(testNode); path = SchemaPath.create(true, QName.create(myModule.getQNameModule(), "my-container"), QName.create(myModule.getQNameModule(), "my-list"), QName.create(myModule.getQNameModule(), "no-leaf-list-in-list")); foundNode = SchemaContextUtil.findNodeInSchemaContext(context, path.getPathFromRoot()); - - assertNull(testNode); assertNull(foundNode); - } @Test diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.java index ea1a9bf677..73bd1765d1 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.java @@ -388,7 +388,7 @@ public final class SchemaContextUtil { SchemaNode foundNode = null; final Iterable nextPath = nextLevel(path); - foundNode = module.getDataChildByName(current); + foundNode = module.dataChildByName(current); if (foundNode != null && nextPath.iterator().hasNext()) { foundNode = findNodeIn(foundNode, nextPath); } @@ -436,7 +436,7 @@ public final class SchemaContextUtil { if (parent instanceof DataNodeContainer) { final DataNodeContainer parentDataNodeContainer = (DataNodeContainer) parent; - foundNode = parentDataNodeContainer.getDataChildByName(current); + foundNode = parentDataNodeContainer.dataChildByName(current); if (foundNode != null && nextPath.iterator().hasNext()) { foundNode = findNodeIn(foundNode, nextPath); } @@ -500,7 +500,7 @@ public final class SchemaContextUtil { if (foundNode == null) { // fallback that tries to map into one of the child cases for (final CaseSchemaNode caseNode : ((ChoiceSchemaNode) parent).getCases()) { - final DataSchemaNode maybeChild = caseNode.getDataChildByName(current); + final DataSchemaNode maybeChild = caseNode.dataChildByName(current); if (maybeChild != null) { foundNode = findNodeIn(maybeChild, nextPath); break; @@ -611,7 +611,7 @@ public final class SchemaContextUtil { return QName.create(module.getQNameModule(), prefixedName.next()); } - return QName.create(parentModule.getNamespace(), parentModule.getRevision(), prefixedPathPart); + return QName.create(parentModule.getQNameModule(), prefixedPathPart); } /** diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtilTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtilTest.java index f25b435982..8e7ab07580 100644 --- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtilTest.java +++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtilTest.java @@ -55,9 +55,7 @@ public class SchemaContextUtilTest { doReturn("test").when(mockModule).getName(); doReturn("test").when(mockModule).getPrefix(); - doReturn(NAMESPACE).when(mockModule).getNamespace(); doReturn(QNameModule.create(NAMESPACE)).when(mockModule).getQNameModule(); - doReturn(Optional.empty()).when(mockModule).getRevision(); } @Test diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaRepositoryWithFeaturesTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaRepositoryWithFeaturesTest.java index 1447bab499..41473ea213 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaRepositoryWithFeaturesTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaRepositoryWithFeaturesTest.java @@ -60,7 +60,7 @@ public class SharedSchemaRepositoryWithFeaturesTest { QName.create(module.getQNameModule(), "test-leaf-a")); assertNotNull(testLeafA); - final ContainerSchemaNode testContainerB = (ContainerSchemaNode) module.getDataChildByName( + final ContainerSchemaNode testContainerB = (ContainerSchemaNode) module.dataChildByName( QName.create(module.getQNameModule(), "test-container-b")); assertNull(testContainerB); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ControllerStmtParserTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ControllerStmtParserTest.java index a993428826..e65d6a021f 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ControllerStmtParserTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ControllerStmtParserTest.java @@ -45,12 +45,12 @@ public class ControllerStmtParserTest { boolean checked = false; for (final AugmentationSchemaNode augmentationSchema : module.getAugmentations()) { - final DataSchemaNode dataNode = augmentationSchema - .getDataChildByName(QName.create(module.getQNameModule(), "dom-broker-impl")); + final DataSchemaNode dataNode = augmentationSchema.dataChildByName( + QName.create(module.getQNameModule(), "dom-broker-impl")); if (dataNode instanceof CaseSchemaNode) { final CaseSchemaNode caseNode = (CaseSchemaNode) dataNode; - final DataSchemaNode dataNode2 = caseNode - .getDataChildByName(QName.create(module.getQNameModule(), "async-data-broker")); + final DataSchemaNode dataNode2 = caseNode.dataChildByName( + QName.create(module.getQNameModule(), "async-data-broker")); if (dataNode2 instanceof ContainerSchemaNode) { final ContainerSchemaNode containerNode = (ContainerSchemaNode) dataNode2; final DataSchemaNode leaf = containerNode diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/DeviationResolutionTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/DeviationResolutionTest.java index 77170fe94b..b309258822 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/DeviationResolutionTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/DeviationResolutionTest.java @@ -61,7 +61,7 @@ public class DeviationResolutionTest { assertEquals(1, myContA.getChildNodes().size()); assertNotNull(myContA.getDataChildByName(QName.create(importedModule.getQNameModule(), "my-leaf-a3"))); - final ContainerSchemaNode myContB = (ContainerSchemaNode) importedModule.getDataChildByName( + final ContainerSchemaNode myContB = (ContainerSchemaNode) importedModule.dataChildByName( QName.create(importedModule.getQNameModule(), "my-cont-b")); assertNull(myContB); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveSchemaContextTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveSchemaContextTest.java index d202952d88..73080218fb 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveSchemaContextTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveSchemaContextTest.java @@ -66,7 +66,7 @@ public class EffectiveSchemaContextTest { final Collection unknownSchemaNodes = schemaContext.getUnknownSchemaNodes(); assertEquals(3, unknownSchemaNodes.size()); - assertNull(schemaContext.getDataChildByName(QName.create("foo-namespace", "2016-09-21", "foo-cont"))); + assertNull(schemaContext.dataChildByName(QName.create("foo-namespace", "2016-09-21", "foo-cont"))); assertFalse(schemaContext.findModule("foo", Revision.of("2016-08-21")).isPresent()); assertFalse(schemaContext.findModule(URI.create("foo-namespace"), Revision.of("2016-08-21")).isPresent()); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/IfFeatureResolutionTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/IfFeatureResolutionTest.java index 82b3dbc109..673e3f631d 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/IfFeatureResolutionTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/IfFeatureResolutionTest.java @@ -48,7 +48,7 @@ public class IfFeatureResolutionTest { final Module testModule = schemaContext.findModule("foo").get(); assertEquals(9, testModule.getChildNodes().size()); - final ContainerSchemaNode testContainerA = (ContainerSchemaNode) testModule.getDataChildByName( + final ContainerSchemaNode testContainerA = (ContainerSchemaNode) testModule.dataChildByName( QName.create(testModule.getQNameModule(), "test-container-a")); assertNull(testContainerA); @@ -66,7 +66,7 @@ public class IfFeatureResolutionTest { QName.create(testModule.getQNameModule(), "test-leaf-c")); assertNotNull(testLeafC); - final ContainerSchemaNode testContainerD = (ContainerSchemaNode) testModule.getDataChildByName( + final ContainerSchemaNode testContainerD = (ContainerSchemaNode) testModule.dataChildByName( QName.create(testModule.getQNameModule(), "test-container-d")); assertNull(testContainerD); @@ -76,14 +76,14 @@ public class IfFeatureResolutionTest { final ContainerSchemaNode testSubContainerE = (ContainerSchemaNode) testContainerE.getDataChildByName( QName.create(testModule.getQNameModule(), "test-subcontainer-e")); assertNotNull(testSubContainerE); - final LeafSchemaNode testLeafE = (LeafSchemaNode) testSubContainerE.getDataChildByName( + final LeafSchemaNode testLeafE = (LeafSchemaNode) testSubContainerE.dataChildByName( QName.create(testModule.getQNameModule(), "test-leaf-e")); assertNull(testLeafE); final ContainerSchemaNode testContainerF = (ContainerSchemaNode) testModule.getDataChildByName( QName.create(testModule.getQNameModule(), "test-container-f")); assertNotNull(testContainerF); - final ContainerSchemaNode testSubContainerF = (ContainerSchemaNode) testContainerF.getDataChildByName( + final ContainerSchemaNode testSubContainerF = (ContainerSchemaNode) testContainerF.dataChildByName( QName.create(testModule.getQNameModule(), "test-subcontainer-f")); assertNull(testSubContainerF); @@ -94,7 +94,7 @@ public class IfFeatureResolutionTest { final LeafSchemaNode testLeafG = (LeafSchemaNode) testContainerG.getDataChildByName( QName.create(testModule.getQNameModule(), "test-leaf-g")); assertNotNull(testLeafG); - final LeafSchemaNode augmentingTestLeafG = (LeafSchemaNode) testContainerG.getDataChildByName( + final LeafSchemaNode augmentingTestLeafG = (LeafSchemaNode) testContainerG.dataChildByName( QName.create(testModule.getQNameModule(), "augmenting-test-leaf-g")); assertNull(augmentingTestLeafG); final AnyxmlSchemaNode augmentingTestAnyxmlG = (AnyxmlSchemaNode) testContainerG.getDataChildByName( @@ -114,7 +114,7 @@ public class IfFeatureResolutionTest { ContainerSchemaNode testGroupingSubContainer = (ContainerSchemaNode) testContainerI.getDataChildByName( QName.create(testModule.getQNameModule(), "test-grouping-subcontainer")); assertNotNull(testGroupingSubContainer); - final LeafSchemaNode testGroupingLeaf = (LeafSchemaNode) testGroupingSubContainer.getDataChildByName( + final LeafSchemaNode testGroupingLeaf = (LeafSchemaNode) testGroupingSubContainer.dataChildByName( QName.create(testModule.getQNameModule(), "test-grouping-leaf")); assertNull(testGroupingLeaf); @@ -136,7 +136,7 @@ public class IfFeatureResolutionTest { final LeafSchemaNode augmentingTestGroupingLeaf = (LeafSchemaNode) testGroupingSubContainer.getDataChildByName( QName.create(testModule.getQNameModule(), "augmenting-test-grouping-leaf")); assertNotNull(augmentingTestGroupingLeaf); - final LeafSchemaNode augmentingTestGroupingLeaf2 = (LeafSchemaNode) testGroupingSubContainer.getDataChildByName( + final LeafSchemaNode augmentingTestGroupingLeaf2 = (LeafSchemaNode) testGroupingSubContainer.dataChildByName( QName.create(testModule.getQNameModule(), "augmenting-test-grouping-leaf-2")); assertNull(augmentingTestGroupingLeaf2); } @@ -286,14 +286,14 @@ public class IfFeatureResolutionTest { final ContainerSchemaNode testSubContainerE = (ContainerSchemaNode) testContainerE.getDataChildByName( QName.create(testModule.getQNameModule(), "test-subcontainer-e")); assertNotNull(testSubContainerE); - final LeafSchemaNode testLeafE = (LeafSchemaNode) testSubContainerE.getDataChildByName( + final LeafSchemaNode testLeafE = (LeafSchemaNode) testSubContainerE.dataChildByName( QName.create(testModule.getQNameModule(), "test-leaf-e")); assertNull(testLeafE); final ContainerSchemaNode testContainerF = (ContainerSchemaNode) testModule.getDataChildByName( QName.create(testModule.getQNameModule(), "test-container-f")); assertNotNull(testContainerF); - final ContainerSchemaNode testSubContainerF = (ContainerSchemaNode) testContainerF.getDataChildByName( + final ContainerSchemaNode testSubContainerF = (ContainerSchemaNode) testContainerF.dataChildByName( QName.create(testModule.getQNameModule(), "test-subcontainer-f")); assertNull(testSubContainerF); @@ -304,7 +304,7 @@ public class IfFeatureResolutionTest { final LeafSchemaNode testLeafG = (LeafSchemaNode) testContainerG.getDataChildByName( QName.create(testModule.getQNameModule(), "test-leaf-g")); assertNotNull(testLeafG); - final LeafSchemaNode augmentingTestLeafG = (LeafSchemaNode) testContainerG.getDataChildByName( + final LeafSchemaNode augmentingTestLeafG = (LeafSchemaNode) testContainerG.dataChildByName( QName.create(testModule.getQNameModule(), "augmenting-test-leaf-g")); assertNull(augmentingTestLeafG); final AnyxmlSchemaNode augmentingTestAnyxmlG = (AnyxmlSchemaNode) testContainerG.getDataChildByName( @@ -324,7 +324,7 @@ public class IfFeatureResolutionTest { ContainerSchemaNode testGroupingSubContainer = (ContainerSchemaNode) testContainerI.getDataChildByName( QName.create(testModule.getQNameModule(), "test-grouping-subcontainer")); assertNotNull(testGroupingSubContainer); - LeafSchemaNode testGroupingLeaf = (LeafSchemaNode) testGroupingSubContainer.getDataChildByName( + LeafSchemaNode testGroupingLeaf = (LeafSchemaNode) testGroupingSubContainer.dataChildByName( QName.create(testModule.getQNameModule(), "test-grouping-leaf")); assertNull(testGroupingLeaf); @@ -336,13 +336,13 @@ public class IfFeatureResolutionTest { QName.create(testModule.getQNameModule(), "test-grouping-subcontainer")); assertNotNull(testGroupingSubContainer); assertEquals(1, testGroupingSubContainer.getAvailableAugmentations().size()); - final LeafSchemaNode augmentingTestGroupingLeaf = (LeafSchemaNode) testGroupingSubContainer.getDataChildByName( + final LeafSchemaNode augmentingTestGroupingLeaf = (LeafSchemaNode) testGroupingSubContainer.dataChildByName( QName.create(testModule.getQNameModule(), "augmenting-test-grouping-leaf")); assertNull(augmentingTestGroupingLeaf); - final LeafSchemaNode augmentingTestGroupingLeaf2 = (LeafSchemaNode) testGroupingSubContainer.getDataChildByName( + final LeafSchemaNode augmentingTestGroupingLeaf2 = (LeafSchemaNode) testGroupingSubContainer.dataChildByName( QName.create(testModule.getQNameModule(), "augmenting-test-grouping-leaf-2")); assertNull(augmentingTestGroupingLeaf2); - testGroupingLeaf = (LeafSchemaNode) testGroupingSubContainer.getDataChildByName( + testGroupingLeaf = (LeafSchemaNode) testGroupingSubContainer.dataChildByName( QName.create(testModule.getQNameModule(), "test-grouping-leaf")); assertNull(testGroupingLeaf); }