From c07aad0f89c57a66089df3c431c1767ab4a04eea Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 20 Nov 2017 17:34:07 +0100 Subject: [PATCH] Rename ChoiceCaseNode to CaseSchemaNode ChoiceCaseNode is a long-standing misnomer, causing API inconsistency in yang-model-api. Rename it to CaseSchemaNode, just as all the other SchemaNodes. Change-Id: I4f2fa74a69a75ab9b7cd40d27ad756285486a791 Signed-off-by: Robert Varga --- .../yang/data/api/schema/ChoiceNode.java | 2 +- .../data/codec/gson/JsonParserStream.java | 4 +-- .../xml/NormalizedNodeXmlTranslationTest.java | 4 +-- .../yang/data/impl/codec/SchemaTracker.java | 6 ++-- .../leafref/LeafRefContextTreeBuilder.java | 6 ++-- .../yang/data/impl/leafref/LeafRefUtils.java | 4 +-- .../schema/InstanceIdToCompositeNodes.java | 4 +-- .../data/impl/schema/InstanceIdToNodes.java | 4 +-- .../SchemaOrderedNormalizedNodeWriter.java | 4 +-- .../yang/data/impl/schema/SchemaUtils.java | 28 +++++++++---------- ...ImmutableChoiceNodeSchemaAwareBuilder.java | 4 +-- .../valid/DataNodeContainerValidator.java | 4 +-- .../data/impl/schema/tree/CaseEnforcer.java | 4 +-- .../tree/ChoiceModificationStrategy.java | 4 +-- .../schema/NormalizedDataBuilderTest.java | 4 +-- .../data/util/CaseNodeDataWithSchema.java | 4 +-- .../yang/data/util/ChoiceNodeContextNode.java | 4 +-- .../data/util/ChoiceNodeDataWithSchema.java | 4 +-- .../util/CompositeNodeDataWithSchema.java | 6 ++-- .../yang/data/util/DataSchemaContextNode.java | 4 +-- .../yang/data/util/ParserStreamUtils.java | 4 +-- ...hoiceCaseNode.java => CaseSchemaNode.java} | 4 +-- .../yang/model/api/ChoiceSchemaNode.java | 14 +++++----- .../yang/model/api/DataSchemaNode.java | 2 +- .../yang/model/api/package-info.java | 2 +- .../model/export/SchemaContextEmitter.java | 18 ++++++------ .../immutable/AbstractChoiceCaseNode.java | 4 +-- .../yang/model/util/DataNodeIterator.java | 4 +-- .../yang/model/util/SchemaContextUtil.java | 4 +-- .../yang/model/util/DataNodeIteratorTest.java | 8 +++--- ...tEffectiveDocumentedDataNodeContainer.java | 8 +++--- .../case_/CaseEffectiveStatementImpl.java | 10 +++---- .../choice/ChoiceEffectiveStatementImpl.java | 18 ++++++------ ...eNode.java => ImplicitCaseSchemaNode.java} | 16 +++++------ .../yang/stmt/AugmentProcessTest.java | 4 +-- .../yangtools/yang/stmt/AugmentTest.java | 26 ++++++++--------- .../yangtools/yang/stmt/Bug5884Test.java | 4 +-- .../yangtools/yang/stmt/Bug6183Test.java | 10 +++---- .../yangtools/yang/stmt/CaseStmtTest.java | 4 +-- .../yangtools/yang/stmt/ChoiceStmtTest.java | 4 +-- .../yang/stmt/ControllerStmtParserTest.java | 10 +++---- .../yangtools/yang/stmt/GroupingTest.java | 6 ++-- .../yangtools/yang/stmt/TestUtils.java | 6 ++-- .../yangtools/yang/stmt/YangParserTest.java | 10 +++---- .../yang/stmt/yin/YinFileAugmentStmtTest.java | 4 +-- .../yang/stmt/yin/YinFileChoiceStmtTest.java | 6 ++-- .../yang/stmt/yin/YinFileUsesStmtTest.java | 4 +-- 47 files changed, 161 insertions(+), 161 deletions(-) rename yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/{ChoiceCaseNode.java => CaseSchemaNode.java} (73%) rename yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/choice/{ImplicitChoiceCaseNode.java => ImplicitCaseSchemaNode.java} (91%) diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/ChoiceNode.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/ChoiceNode.java index 54761d96ff..d5cc5b467f 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/ChoiceNode.java +++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/ChoiceNode.java @@ -24,7 +24,7 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgum * *

* Valid alternatives of subtree are described by instances of - * {@link org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode}, which are retrieved via + * {@link org.opendaylight.yangtools.yang.model.api.CaseSchemaNode}, which are retrieved via * {@link org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode#getCases()}. */ public interface ChoiceNode extends MixinNode, DataContainerNode, diff --git a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonParserStream.java b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonParserStream.java index 1e34c88b61..bb35ce8198 100644 --- a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonParserStream.java +++ b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonParserStream.java @@ -45,7 +45,7 @@ import org.opendaylight.yangtools.yang.data.util.ListNodeDataWithSchema; import org.opendaylight.yangtools.yang.data.util.ParserStreamUtils; import org.opendaylight.yangtools.yang.data.util.RpcAsContainer; import org.opendaylight.yangtools.yang.data.util.SimpleNodeDataWithSchema; -import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; +import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; @@ -353,7 +353,7 @@ public final class JsonParserStream implements Closeable, Flushable { } for (final ChoiceSchemaNode choiceNode : choices) { - for (final ChoiceCaseNode concreteCase : choiceNode.getCases().values()) { + for (final CaseSchemaNode concreteCase : choiceNode.getCases().values()) { potentialUris.addAll(resolveAllPotentialNamespaces(elementName, concreteCase)); } } diff --git a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/NormalizedNodeXmlTranslationTest.java b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/NormalizedNodeXmlTranslationTest.java index e3040bcb71..925c8f4be7 100644 --- a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/NormalizedNodeXmlTranslationTest.java +++ b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/NormalizedNodeXmlTranslationTest.java @@ -68,7 +68,7 @@ import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.CollectionNo import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.ListNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.NormalizedNodeBuilder; -import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; +import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; @@ -371,7 +371,7 @@ public class NormalizedNodeXmlTranslationTest { return retVal; } } else if (dataSchemaNode instanceof ChoiceSchemaNode) { - for (ChoiceCaseNode caseNode : ((ChoiceSchemaNode) dataSchemaNode).getCases().values()) { + for (CaseSchemaNode caseNode : ((ChoiceSchemaNode) dataSchemaNode).getCases().values()) { DataSchemaNode retVal = findChildNode(caseNode, name); if (retVal != null) { return retVal; 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 826b7210ba..41a412c911 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 @@ -27,7 +27,7 @@ import org.opendaylight.yangtools.yang.data.impl.schema.SchemaUtils; import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; import org.opendaylight.yangtools.yang.model.api.AugmentationTarget; -import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; +import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; @@ -121,7 +121,7 @@ public final class SchemaTracker { private static SchemaNode findChildInCases(final ChoiceSchemaNode parent, final QName qname) { DataSchemaNode schema = null; - for (final ChoiceCaseNode caze : parent.getCases().values()) { + for (final CaseSchemaNode caze : parent.getCases().values()) { final DataSchemaNode potential = caze.getDataChildByName(qname); if (potential != null) { schema = potential; @@ -133,7 +133,7 @@ public final class SchemaTracker { private static SchemaNode findCaseByChild(final ChoiceSchemaNode parent, final QName qname) { DataSchemaNode schema = null; - for (final ChoiceCaseNode caze : parent.getCases().values()) { + for (final CaseSchemaNode caze : parent.getCases().values()) { final DataSchemaNode potential = caze.getDataChildByName(qname); if (potential != null) { schema = caze; diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefContextTreeBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefContextTreeBuilder.java index c9e3d1bdff..f17ce4e735 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefContextTreeBuilder.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefContextTreeBuilder.java @@ -16,7 +16,7 @@ import java.util.Collection; import java.util.LinkedList; import java.util.List; import java.util.Set; -import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; +import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; @@ -103,7 +103,7 @@ class LeafRefContextTreeBuilder { final ChoiceSchemaNode choice = (ChoiceSchemaNode) node; // :FIXME choice without case - for (final ChoiceCaseNode caseNode : choice.getCases().values()) { + for (final CaseSchemaNode caseNode : choice.getCases().values()) { final LeafRefContext childLeafRefContext = buildLeafRefContextReferencingTree( caseNode, currentModule); @@ -180,7 +180,7 @@ class LeafRefContextTreeBuilder { } } } else if (node instanceof ChoiceSchemaNode) { - for (final ChoiceCaseNode caseNode : ((ChoiceSchemaNode) node).getCases().values()) { + for (final CaseSchemaNode caseNode : ((ChoiceSchemaNode) node).getCases().values()) { final LeafRefContext childLeafRefContext = buildLeafRefContextReferencedByTree(caseNode, currentModule); if (childLeafRefContext.hasReferencedChild() || childLeafRefContext.isReferenced()) { 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 9fcff62a27..3f7e41c0d0 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 @@ -11,7 +11,7 @@ import java.util.Deque; import java.util.Iterator; import java.util.LinkedList; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; +import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; @@ -72,7 +72,7 @@ public final class LeafRefUtils { .getDataChildByName(qname); if (child instanceof DataNodeContainer) { - if (!(child instanceof ChoiceCaseNode)) { + if (!(child instanceof CaseSchemaNode)) { final QNameWithPredicate newQName = new QNameWithPredicateBuilder( qname.getModule(), qname.getLocalName()).build(); xpath.add(newQName); diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/InstanceIdToCompositeNodes.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/InstanceIdToCompositeNodes.java index f891cda0b7..1e68bea939 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/InstanceIdToCompositeNodes.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/InstanceIdToCompositeNodes.java @@ -46,7 +46,7 @@ import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContaine import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.ListNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.NormalizedNodeContainerBuilder; import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; -import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; +import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; @@ -330,7 +330,7 @@ abstract class InstanceIdToCompositeNodes extends Instan super(NodeIdentifier.create(schema.getQName())); final ImmutableMap.Builder> byArgBuilder = ImmutableMap.builder(); - for (final ChoiceCaseNode caze : schema.getCases().values()) { + for (final CaseSchemaNode caze : schema.getCases().values()) { for (final DataSchemaNode cazeChild : caze.getChildNodes()) { final InstanceIdToNodes childOp = fromDataSchemaNode(cazeChild); byArgBuilder.put(childOp.getIdentifier(), childOp); diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/InstanceIdToNodes.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/InstanceIdToNodes.java index 471d8b07e4..bf6bcc1a48 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/InstanceIdToNodes.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/InstanceIdToNodes.java @@ -30,7 +30,7 @@ import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.NormalizedNo import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; import org.opendaylight.yangtools.yang.model.api.AugmentationTarget; -import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; +import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; @@ -179,7 +179,7 @@ abstract class InstanceIdToNodes implements Identifiable ChoiceSchemaNode foundChoice = null; choiceLoop: for (final ChoiceSchemaNode choice : choices) { - for (final ChoiceCaseNode caze : choice.getCases().values()) { + for (final CaseSchemaNode caze : choice.getCases().values()) { if (findChildSchemaNode(caze, child).isPresent()) { foundChoice = choice; break choiceLoop; 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 fb4033140d..9a1b9bd1f0 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 @@ -19,7 +19,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeWriter; -import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; +import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; @@ -146,7 +146,7 @@ public class SchemaOrderedNormalizedNodeWriter extends NormalizedNodeWriter { } } } else if (parentSchemaNode instanceof ChoiceSchemaNode) { - for (final ChoiceCaseNode ccNode : ((ChoiceSchemaNode) parentSchemaNode).getCases().values()) { + for (final CaseSchemaNode ccNode : ((ChoiceSchemaNode) parentSchemaNode).getCases().values()) { for (final DataSchemaNode dsn : ccNode.getChildNodes()) { if (qNameToNodes.containsKey(dsn.getQName())) { write(qNameToNodes.get(dsn.getQName()), dsn); 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 b1bd57459d..1b031b6488 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 @@ -32,7 +32,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; import org.opendaylight.yangtools.yang.model.api.ActionNodeContainer; import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; import org.opendaylight.yangtools.yang.model.api.AugmentationTarget; -import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; +import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; @@ -65,7 +65,7 @@ public final class SchemaUtils { schema = dsn; } } else if (dsn instanceof ChoiceSchemaNode) { - for (final ChoiceCaseNode choiceCase : ((ChoiceSchemaNode) dsn).getCases().values()) { + for (final CaseSchemaNode choiceCase : ((ChoiceSchemaNode) dsn).getCases().values()) { final DataSchemaNode dataChildByName = choiceCase.getDataChildByName(qname); if (dataChildByName != null) { @@ -120,7 +120,7 @@ public final class SchemaUtils { } public static DataSchemaNode findSchemaForChild(final ChoiceSchemaNode schema, final QName childPartialQName) { - for (final ChoiceCaseNode choiceCaseNode : schema.getCases().values()) { + for (final CaseSchemaNode choiceCaseNode : schema.getCases().values()) { final Optional childSchema = findFirstSchema(childPartialQName, choiceCaseNode.getChildNodes()); if (childSchema.isPresent()) { @@ -142,7 +142,7 @@ public final class SchemaUtils { } public static AugmentationSchemaNode findSchemaForAugment(final ChoiceSchemaNode schema, final Set qnames) { - for (final ChoiceCaseNode choiceCaseNode : schema.getCases().values()) { + for (final CaseSchemaNode choiceCaseNode : schema.getCases().values()) { final Optional schemaForAugment = findAugment(choiceCaseNode, qnames); if (schemaForAugment.isPresent()) { return schemaForAugment.get(); @@ -188,7 +188,7 @@ public final class SchemaUtils { continue; } - for (final ChoiceCaseNode choiceCaseNode : ((ChoiceSchemaNode) childSchema).getCases().values()) { + for (final CaseSchemaNode choiceCaseNode : ((ChoiceSchemaNode) childSchema).getCases().values()) { for (final QName qname : getChildNodesRecursive(choiceCaseNode)) { mappedChoices.put(qname, (ChoiceSchemaNode) childSchema); } @@ -244,12 +244,12 @@ public final class SchemaUtils { final AugmentationSchemaNode mostTopAugmentation = augments.get(child.getQName()); // recursively add all child nodes in case of augment, case and choice - if (child instanceof AugmentationSchemaNode || child instanceof ChoiceCaseNode) { + if (child instanceof AugmentationSchemaNode || child instanceof CaseSchemaNode) { for (final QName qname : getChildNodesRecursive((DataNodeContainer) child)) { childNodesToAugmentation.put(qname, mostTopAugmentation); } } else if (child instanceof ChoiceSchemaNode) { - for (final ChoiceCaseNode choiceCaseNode : ((ChoiceSchemaNode) child).getCases().values()) { + for (final CaseSchemaNode choiceCaseNode : ((ChoiceSchemaNode) child).getCases().values()) { for (final QName qname : getChildNodesRecursive(choiceCaseNode)) { childNodesToAugmentation.put(qname, mostTopAugmentation); } @@ -262,7 +262,7 @@ public final class SchemaUtils { // Choice Node has to map child nodes from all its cases if (schema instanceof ChoiceSchemaNode) { - for (final ChoiceCaseNode choiceCaseNode : ((ChoiceSchemaNode) schema).getCases().values()) { + for (final CaseSchemaNode choiceCaseNode : ((ChoiceSchemaNode) schema).getCases().values()) { if (!augments.containsKey(choiceCaseNode.getQName())) { continue; } @@ -287,10 +287,10 @@ public final class SchemaUtils { for (final DataSchemaNode childSchema : nodeContainer.getChildNodes()) { if (childSchema instanceof ChoiceSchemaNode) { - for (final ChoiceCaseNode choiceCaseNode : ((ChoiceSchemaNode) childSchema).getCases().values()) { + for (final CaseSchemaNode choiceCaseNode : ((ChoiceSchemaNode) childSchema).getCases().values()) { allChildNodes.addAll(getChildNodesRecursive(choiceCaseNode)); } - } else if (childSchema instanceof AugmentationSchemaNode || childSchema instanceof ChoiceCaseNode) { + } else if (childSchema instanceof AugmentationSchemaNode || childSchema instanceof CaseSchemaNode) { allChildNodes.addAll(getChildNodesRecursive((DataNodeContainer) childSchema)); } else { allChildNodes.add(childSchema.getQName()); @@ -322,7 +322,7 @@ public final class SchemaUtils { final Set realChildNodes = new HashSet<>(); if (targetSchema instanceof ChoiceSchemaNode) { for (final DataSchemaNode dataSchemaNode : augmentSchema.getChildNodes()) { - for (final ChoiceCaseNode choiceCaseNode : ((ChoiceSchemaNode) targetSchema).getCases().values()) { + for (final CaseSchemaNode choiceCaseNode : ((ChoiceSchemaNode) targetSchema).getCases().values()) { if (getChildNodesRecursive(choiceCaseNode).contains(dataSchemaNode.getQName())) { realChildNodes.add(choiceCaseNode.getDataChildByName(dataSchemaNode.getQName())); } @@ -343,9 +343,9 @@ public final class SchemaUtils { return realChildNodes; } - public static Optional detectCase(final ChoiceSchemaNode schema, + public static Optional detectCase(final ChoiceSchemaNode schema, final DataContainerChild child) { - for (final ChoiceCaseNode choiceCaseNode : schema.getCases().values()) { + for (final CaseSchemaNode choiceCaseNode : schema.getCases().values()) { if (child instanceof AugmentationNode && belongsToCaseAugment(choiceCaseNode, (AugmentationIdentifier) child.getIdentifier())) { return Optional.of(choiceCaseNode); @@ -357,7 +357,7 @@ public final class SchemaUtils { return Optional.empty(); } - public static boolean belongsToCaseAugment(final ChoiceCaseNode caseNode, + public static boolean belongsToCaseAugment(final CaseSchemaNode caseNode, final AugmentationIdentifier childToProcess) { for (final AugmentationSchemaNode augmentationSchema : caseNode.getAvailableAugmentations()) { diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableChoiceNodeSchemaAwareBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableChoiceNodeSchemaAwareBuilder.java index 4ae76f7266..e4fdaf5fd8 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableChoiceNodeSchemaAwareBuilder.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableChoiceNodeSchemaAwareBuilder.java @@ -17,7 +17,7 @@ import org.opendaylight.yangtools.yang.data.impl.schema.SchemaUtils; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.valid.DataNodeContainerValidator; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.valid.DataValidationException; -import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; +import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; public class ImmutableChoiceNodeSchemaAwareBuilder extends ImmutableChoiceNodeBuilder { @@ -39,7 +39,7 @@ public class ImmutableChoiceNodeSchemaAwareBuilder extends ImmutableChoiceNodeBu @Override public DataContainerNodeBuilder withChild(final DataContainerChild child) { if (validator == null) { - Optional detectedCaseOpt = SchemaUtils.detectCase(schema, child); + Optional detectedCaseOpt = SchemaUtils.detectCase(schema, child); DataValidationException.checkLegalChild(detectedCaseOpt.isPresent(), child.getIdentifier(), schema); validator = new DataNodeContainerValidator(detectedCaseOpt.get()); } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/valid/DataNodeContainerValidator.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/valid/DataNodeContainerValidator.java index 452f1e341e..be32972317 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/valid/DataNodeContainerValidator.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/valid/DataNodeContainerValidator.java @@ -17,7 +17,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; import org.opendaylight.yangtools.yang.data.impl.schema.SchemaUtils; import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; import org.opendaylight.yangtools.yang.model.api.AugmentationTarget; -import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; +import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; @@ -65,7 +65,7 @@ public class DataNodeContainerValidator { Set allChildNodes = new HashSet<>(); for (DataSchemaNode childSchema : nodeContainer.getChildNodes()) { - if (childSchema instanceof ChoiceCaseNode) { + if (childSchema instanceof CaseSchemaNode) { allChildNodes.addAll(getChildNodes((DataNodeContainer) childSchema)); } else if (!(childSchema instanceof AugmentationSchemaNode)) { allChildNodes.add(childSchema.getQName()); diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/CaseEnforcer.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/CaseEnforcer.java index 4f82c5b61b..32ff97867c 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/CaseEnforcer.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/CaseEnforcer.java @@ -25,7 +25,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeConfiguratio import org.opendaylight.yangtools.yang.data.api.schema.tree.TreeType; import org.opendaylight.yangtools.yang.data.impl.schema.SchemaUtils; import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; -import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; +import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; final class CaseEnforcer implements Immutable { @@ -41,7 +41,7 @@ final class CaseEnforcer implements Immutable { this.enforcer = Preconditions.checkNotNull(enforcer); } - static CaseEnforcer forTree(final ChoiceCaseNode schema, final DataTreeConfiguration treeConfig) { + static CaseEnforcer forTree(final CaseSchemaNode schema, final DataTreeConfiguration treeConfig) { final TreeType type = treeConfig.getTreeType(); final Builder childrenBuilder = ImmutableMap.builder(); final Builder augmentationsBuilder = ImmutableMap.builder(); diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ChoiceModificationStrategy.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ChoiceModificationStrategy.java index bc03a63eed..ddf81930e1 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ChoiceModificationStrategy.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ChoiceModificationStrategy.java @@ -34,7 +34,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.Version; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableChoiceNodeBuilder; import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; -import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; +import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; @@ -49,7 +49,7 @@ final class ChoiceModificationStrategy extends AbstractNodeContainerModification final Builder childBuilder = ImmutableMap.builder(); final Builder enforcerBuilder = ImmutableMap.builder(); - for (final ChoiceCaseNode caze : schemaNode.getCases().values()) { + for (final CaseSchemaNode caze : schemaNode.getCases().values()) { final CaseEnforcer enforcer = CaseEnforcer.forTree(caze, treeConfig); if (enforcer != null) { for (final Entry e : enforcer.getChildEntries()) { diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/NormalizedDataBuilderTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/NormalizedDataBuilderTest.java index ca57bc31fd..dc7f12f131 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/NormalizedDataBuilderTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/NormalizedDataBuilderTest.java @@ -32,7 +32,7 @@ import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContaine import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableChoiceNodeSchemaAwareBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableMapNodeSchemaAwareBuilder; import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; -import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; +import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; @@ -212,7 +212,7 @@ public class NormalizedDataBuilderTest { return retVal; } } else if (dataSchemaNode instanceof ChoiceSchemaNode) { - for (ChoiceCaseNode caseNode : ((ChoiceSchemaNode) dataSchemaNode).getCases().values()) { + for (CaseSchemaNode caseNode : ((ChoiceSchemaNode) dataSchemaNode).getCases().values()) { DataSchemaNode retVal = findChildNode(caseNode, name); if (retVal != null) { return retVal; diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/CaseNodeDataWithSchema.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/CaseNodeDataWithSchema.java index b04d387588..09e1442ade 100644 --- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/CaseNodeDataWithSchema.java +++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/CaseNodeDataWithSchema.java @@ -7,11 +7,11 @@ */ package org.opendaylight.yangtools.yang.data.util; -import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; +import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; class CaseNodeDataWithSchema extends CompositeNodeDataWithSchema { - CaseNodeDataWithSchema(final ChoiceCaseNode schema) { + CaseNodeDataWithSchema(final CaseSchemaNode schema) { super(schema); } diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ChoiceNodeContextNode.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ChoiceNodeContextNode.java index 27bacac529..efa06b981f 100644 --- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ChoiceNodeContextNode.java +++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ChoiceNodeContextNode.java @@ -11,7 +11,7 @@ import com.google.common.collect.ImmutableMap; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; -import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; +import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; @@ -25,7 +25,7 @@ class ChoiceNodeContextNode extends AbstractMixinContextNode { ImmutableMap.Builder> byQNameBuilder = ImmutableMap.builder(); ImmutableMap.Builder> byArgBuilder = ImmutableMap.builder(); - for (ChoiceCaseNode caze : schema.getCases().values()) { + for (CaseSchemaNode caze : schema.getCases().values()) { for (DataSchemaNode cazeChild : caze.getChildNodes()) { DataSchemaContextNode childOp = fromDataSchemaNode(cazeChild); byArgBuilder.put(childOp.getIdentifier(), childOp); diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ChoiceNodeDataWithSchema.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ChoiceNodeDataWithSchema.java index 5f183c127c..6626f773d7 100644 --- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ChoiceNodeDataWithSchema.java +++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ChoiceNodeDataWithSchema.java @@ -9,7 +9,7 @@ package org.opendaylight.yangtools.yang.data.util; import java.io.IOException; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; -import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; +import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; @@ -26,7 +26,7 @@ class ChoiceNodeDataWithSchema extends CompositeNodeDataWithSchema { @Override protected CompositeNodeDataWithSchema addCompositeChild(final DataSchemaNode schema) { - CaseNodeDataWithSchema newChild = new CaseNodeDataWithSchema((ChoiceCaseNode) schema); + CaseNodeDataWithSchema newChild = new CaseNodeDataWithSchema((CaseSchemaNode) schema); caseNodeDataWithSchema = newChild; addCompositeChild(newChild); return newChild; 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 79eb653d0a..0e975443f3 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 @@ -25,7 +25,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStre import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; import org.opendaylight.yangtools.yang.model.api.AugmentationTarget; -import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; +import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; @@ -83,9 +83,9 @@ public class CompositeNodeDataWithSchema extends AbstractNodeDataWithSchema { final ChoiceSchemaNode choiceNode = (ChoiceSchemaNode) choiceCandidate; final DataSchemaNode caseCandidate = schemas.pop(); - Preconditions.checkArgument(caseCandidate instanceof ChoiceCaseNode, + Preconditions.checkArgument(caseCandidate instanceof CaseSchemaNode, "Expected node of type ChoiceCaseNode but was %s", caseCandidate.getClass().getSimpleName()); - final ChoiceCaseNode caseNode = (ChoiceCaseNode) caseCandidate; + final CaseSchemaNode caseNode = (CaseSchemaNode) caseCandidate; AugmentationSchemaNode augSchema = null; if (choiceCandidate.isAugmenting()) { 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 336ab56e94..e51f1a6061 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 @@ -21,7 +21,7 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgum import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; import org.opendaylight.yangtools.yang.model.api.AugmentationTarget; -import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; +import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; @@ -107,7 +107,7 @@ public abstract class DataSchemaContextNode implements I private static ChoiceSchemaNode findChoice(final Iterable choices, final QName child) { for (ChoiceSchemaNode choice : choices) { // FIXME: this looks weird: what are we looking for again? - for (ChoiceCaseNode caze : choice.getCases().values()) { + for (CaseSchemaNode caze : choice.getCases().values()) { if (findChildSchemaNode(caze, child) != null) { return choice; } diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ParserStreamUtils.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ParserStreamUtils.java index b9c17416fc..66ac4c4eab 100644 --- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ParserStreamUtils.java +++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ParserStreamUtils.java @@ -15,7 +15,7 @@ import java.util.Deque; import java.util.List; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.Revision; -import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; +import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; @@ -62,7 +62,7 @@ public final class ParserStreamUtils { // try to find data schema node in choice (looking for first match) for (final ChoiceSchemaNode choiceNode : childChoices) { - for (final ChoiceCaseNode concreteCase : choiceNode.getCases().values()) { + for (final CaseSchemaNode concreteCase : choiceNode.getCases().values()) { final Deque resultFromRecursion = findSchemaNodeByNameAndNamespace(concreteCase, childName, namespace); if (!resultFromRecursion.isEmpty()) { diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ChoiceCaseNode.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/CaseSchemaNode.java similarity index 73% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ChoiceCaseNode.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/CaseSchemaNode.java index 5b12968929..b90cd7470c 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ChoiceCaseNode.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/CaseSchemaNode.java @@ -8,8 +8,8 @@ package org.opendaylight.yangtools.yang.model.api; /** - * The ChoiceCaseNode interface is used to define branches of the ChoiceNode. + * The CaseSchemaNode interface is used to define branches of the ChoiceSchemaNode. */ -public interface ChoiceCaseNode extends DataSchemaNode, DataNodeContainer, AugmentationTarget { +public interface CaseSchemaNode extends DataSchemaNode, DataNodeContainer, AugmentationTarget { } diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ChoiceSchemaNode.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ChoiceSchemaNode.java index 72a20d4fe6..0e472fec97 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ChoiceSchemaNode.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ChoiceSchemaNode.java @@ -28,7 +28,7 @@ public interface ChoiceSchemaNode extends DataSchemaNode, AugmentationTarget, Ma * @return set of ChoiceCaseNode objects defined in this node which represents set of arguments of the YANG * case substatement of the choice statement. */ - SortedMap getCases(); + SortedMap getCases(); /** * Returns the concrete case according to specified Q name. @@ -38,7 +38,7 @@ public interface ChoiceSchemaNode extends DataSchemaNode, AugmentationTarget, Ma * @return child case node of this Choice if child with given name is present, empty otherwise. * @throws NullPointerException if qname is null */ - default Optional findCase(final QName qname) { + default Optional findCase(final QName qname) { return Optional.ofNullable(getCases().get(requireNonNull(qname))); } @@ -51,13 +51,13 @@ public interface ChoiceSchemaNode extends DataSchemaNode, AugmentationTarget, Ma * @throws NullPointerException if localname is null */ @Beta - default List findCaseNodes(final String localname) { + default List findCaseNodes(final String localname) { return getCases().values().stream().filter(node -> localname.equals(node.getQName().getLocalName())) .collect(ImmutableList.toImmutableList()); } /** - * Find a specific data schema child, if present. This method searches among its {@link ChoiceCaseNode}s, + * Find a specific data schema child, if present. This method searches among its {@link CaseSchemaNode}s, * potentially recursing to nested choices. * * @param qname @@ -68,7 +68,7 @@ public interface ChoiceSchemaNode extends DataSchemaNode, AugmentationTarget, Ma @Beta default Optional findDataSchemaChild(final QName qname) { requireNonNull(qname); - for (ChoiceCaseNode caseNode : getCases().values()) { + for (CaseSchemaNode caseNode : getCases().values()) { final Optional child = caseNode.findDataChildByName(qname); if (child.isPresent()) { return child; @@ -88,7 +88,7 @@ public interface ChoiceSchemaNode extends DataSchemaNode, AugmentationTarget, Ma * @deprecated Use either {@code getCases().get(name)} or #findCase(QName) */ @Deprecated - default ChoiceCaseNode getCaseNodeByName(final QName qname) { + default CaseSchemaNode getCaseNodeByName(final QName qname) { return getCases().get(qname); } @@ -98,5 +98,5 @@ public interface ChoiceSchemaNode extends DataSchemaNode, AugmentationTarget, Ma * @return string with the name of case which is specified in the argument of the YANG default * substatement of choice statement. */ - Optional getDefaultCase(); + Optional getDefaultCase(); } diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataSchemaNode.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataSchemaNode.java index 3eeea4d5e0..c0e98d6256 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataSchemaNode.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataSchemaNode.java @@ -18,7 +18,7 @@ package org.opendaylight.yangtools.yang.model.api; * @see ListSchemaNode * @see LeafListSchemaNode * @see ChoiceSchemaNode - * @see ChoiceCaseNode + * @see CaseSchemaNode * @see LeafSchemaNode * @see AnyXmlSchemaNode * @see AnyDataSchemaNode diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/package-info.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/package-info.java index 4024c5a9bf..094ef075be 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/package-info.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/package-info.java @@ -50,7 +50,7 @@ *

{@link org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition#getBits()} * *
case - *
{@link org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode} + *
{@link org.opendaylight.yangtools.yang.model.api.CaseSchemaNode} * *
choice *
{@link org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode} diff --git a/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/SchemaContextEmitter.java b/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/SchemaContextEmitter.java index 1a304d1043..cdb594edbc 100644 --- a/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/SchemaContextEmitter.java +++ b/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/SchemaContextEmitter.java @@ -33,7 +33,7 @@ import org.opendaylight.yangtools.yang.model.api.ActionDefinition; import org.opendaylight.yangtools.yang.model.api.AnyDataSchemaNode; import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; -import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; +import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; @@ -1846,7 +1846,7 @@ abstract class SchemaContextEmitter { emitConfigNode(choice.isConfiguration()); emitMandatoryNode(choice.isMandatory()); emitDocumentedNode(choice); - for (final ChoiceCaseNode caze : choice.getCases().values()) { + for (final CaseSchemaNode caze : choice.getCases().values()) { // TODO: emit short case? emitCaseNode(caze); } @@ -1854,7 +1854,7 @@ abstract class SchemaContextEmitter { super.writer.endNode(); } - private void emitCaseNode(final ChoiceCaseNode caze) { + private void emitCaseNode(final CaseSchemaNode caze) { if (!super.emitInstantiated && caze.isAugmenting()) { return; } @@ -1922,8 +1922,8 @@ abstract class SchemaContextEmitter { emitRefineListNodes((ListSchemaNode) value); } else if (value instanceof ChoiceSchemaNode) { emitRefineChoiceNodes((ChoiceSchemaNode) value); - } else if (value instanceof ChoiceCaseNode) { - emitRefineCaseNodes((ChoiceCaseNode) value); + } else if (value instanceof CaseSchemaNode) { + emitRefineCaseNodes((CaseSchemaNode) value); } else if (value instanceof ContainerSchemaNode) { emitRefineContainerNodes((ContainerSchemaNode) value); } else if (value instanceof AnyXmlSchemaNode) { @@ -2034,8 +2034,8 @@ abstract class SchemaContextEmitter { } - private void emitRefineCaseNodes(final ChoiceCaseNode value) { - final ChoiceCaseNode original = getOriginalChecked(value); + private void emitRefineCaseNodes(final CaseSchemaNode value) { + final CaseSchemaNode original = getOriginalChecked(value); emitDocumentedNodeRefine(original, value); } @@ -2074,8 +2074,8 @@ abstract class SchemaContextEmitter { } for (final DataSchemaNode childNode : augmentation.getChildNodes()) { - if (childNode instanceof ChoiceCaseNode) { - emitCaseNode((ChoiceCaseNode) childNode); + if (childNode instanceof CaseSchemaNode) { + emitCaseNode((CaseSchemaNode) childNode); } else { emitDataSchemaNode(childNode); } diff --git a/yang/yang-model-immutable/src/main/java/org/opendaylight/yangtools/yang/model/immutable/AbstractChoiceCaseNode.java b/yang/yang-model-immutable/src/main/java/org/opendaylight/yangtools/yang/model/immutable/AbstractChoiceCaseNode.java index 3731f4ac63..363b45bf67 100644 --- a/yang/yang-model-immutable/src/main/java/org/opendaylight/yangtools/yang/model/immutable/AbstractChoiceCaseNode.java +++ b/yang/yang-model-immutable/src/main/java/org/opendaylight/yangtools/yang/model/immutable/AbstractChoiceCaseNode.java @@ -8,9 +8,9 @@ package org.opendaylight.yangtools.yang.model.immutable; import org.immutables.value.Value; -import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; +import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; @Value.Immutable -abstract class AbstractChoiceCaseNode extends AbstractDataNodeContainer implements ChoiceCaseNode { +abstract class AbstractChoiceCaseNode extends AbstractDataNodeContainer implements CaseSchemaNode { } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/DataNodeIterator.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/DataNodeIterator.java index 55433e2ba9..e39cb1ba31 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/DataNodeIterator.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/DataNodeIterator.java @@ -12,7 +12,7 @@ import java.util.Collection; import java.util.Iterator; import java.util.List; import java.util.Set; -import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; +import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; @@ -125,7 +125,7 @@ public class DataNodeIterator implements Iterator { } else if (childNode instanceof ChoiceSchemaNode) { final ChoiceSchemaNode choiceNode = (ChoiceSchemaNode) childNode; allChoices.add(choiceNode); - for (final ChoiceCaseNode caseNode : choiceNode.getCases().values()) { + for (final CaseSchemaNode caseNode : choiceNode.getCases().values()) { traverse(caseNode); } } 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 3c367be642..a97a6333a3 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 @@ -22,7 +22,7 @@ import java.util.regex.Pattern; import javax.annotation.Nonnull; import javax.annotation.Nullable; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; +import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; @@ -425,7 +425,7 @@ public final class SchemaContextUtil { if (foundNode == null) { // fallback that tries to map into one of the child cases - for (final ChoiceCaseNode caseNode : ((ChoiceSchemaNode) parent).getCases().values()) { + for (final CaseSchemaNode caseNode : ((ChoiceSchemaNode) parent).getCases().values()) { final DataSchemaNode maybeChild = caseNode.getDataChildByName(current); if (maybeChild != null) { foundNode = findNodeIn(maybeChild, nextPath); diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/DataNodeIteratorTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/DataNodeIteratorTest.java index 4f322defee..799dd63463 100644 --- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/DataNodeIteratorTest.java +++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/DataNodeIteratorTest.java @@ -22,7 +22,7 @@ import java.util.SortedMap; import org.junit.Before; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; +import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; @@ -80,11 +80,11 @@ public class DataNodeIteratorTest { final ListSchemaNode mockedList = mock(ListSchemaNode.class); final ChoiceSchemaNode mockedChoice = mock(ChoiceSchemaNode.class); - final ChoiceCaseNode mockedCase1 = mock(ChoiceCaseNode.class); + final CaseSchemaNode mockedCase1 = mock(CaseSchemaNode.class); final QName mockedCase1QName = QName.create("", "case1"); - final ChoiceCaseNode mockedCase2 = mock(ChoiceCaseNode.class); + final CaseSchemaNode mockedCase2 = mock(CaseSchemaNode.class); final QName mockedCase2QName = QName.create("", "case2"); - final SortedMap cases = ImmutableSortedMap.of(mockedCase1QName, mockedCase1, + final SortedMap cases = ImmutableSortedMap.of(mockedCase1QName, mockedCase1, mockedCase2QName, mockedCase2); doReturn(cases).when(mockedChoice).getCases(); diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveDocumentedDataNodeContainer.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveDocumentedDataNodeContainer.java index 5cccb68fa5..40725e2fc6 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveDocumentedDataNodeContainer.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveDocumentedDataNodeContainer.java @@ -19,7 +19,7 @@ import java.util.Optional; import java.util.Set; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; -import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; +import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; @@ -30,7 +30,7 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.TypedefEffectiveStatement; import org.opendaylight.yangtools.yang.parser.rfc7950.reactor.YangValidationBundles; -import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.choice.ImplicitChoiceCaseNode; +import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.choice.ImplicitCaseSchemaNode; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.spi.source.AugmentToChoiceNamespace; @@ -60,10 +60,10 @@ public abstract class AbstractEffectiveDocumentedDataNodeContainer - implements CaseEffectiveStatement, ChoiceCaseNode, DerivableSchemaNode { + implements CaseEffectiveStatement, CaseSchemaNode, DerivableSchemaNode { - private final ChoiceCaseNode original; + private final CaseSchemaNode original; private final boolean configuration; CaseEffectiveStatementImpl(final StmtContext> ctx) { super(ctx); - this.original = (ChoiceCaseNode) ctx.getOriginalCtx().map(StmtContext::buildEffective).orElse(null); + this.original = (CaseSchemaNode) ctx.getOriginalCtx().map(StmtContext::buildEffective).orElse(null); if (ctx.isConfiguration()) { configuration = ctx.allSubstatementsStream().anyMatch(StmtContext::isConfiguration); @@ -36,7 +36,7 @@ final class CaseEffectiveStatementImpl extends AbstractEffectiveSimpleDataNodeCo } @Override - public Optional getOriginal() { + public Optional getOriginal() { return Optional.ofNullable(original); } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/choice/ChoiceEffectiveStatementImpl.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/choice/ChoiceEffectiveStatementImpl.java index d191ac1b37..0c9d127a9d 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/choice/ChoiceEffectiveStatementImpl.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/choice/ChoiceEffectiveStatementImpl.java @@ -17,7 +17,7 @@ import java.util.SortedMap; import java.util.TreeMap; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; -import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; +import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.DerivableSchemaNode; @@ -41,8 +41,8 @@ final class ChoiceEffectiveStatementImpl extends AbstractEffectiveDataSchemaNode implements ChoiceEffectiveStatement, ChoiceSchemaNode, DerivableSchemaNode { private final Set augmentations; - private final SortedMap cases; - private final ChoiceCaseNode defaultCase; + private final SortedMap cases; + private final CaseSchemaNode defaultCase; private final ChoiceSchemaNode original; private final boolean mandatory; @@ -53,21 +53,21 @@ final class ChoiceEffectiveStatementImpl extends AbstractEffectiveDataSchemaNode // initSubstatementCollectionsAndFields final Set augmentationsInit = new LinkedHashSet<>(); - final SortedMap casesInit = new TreeMap<>(); + final SortedMap casesInit = new TreeMap<>(); for (final EffectiveStatement effectiveStatement : effectiveSubstatements()) { if (effectiveStatement instanceof AugmentationSchemaNode) { final AugmentationSchemaNode augmentationSchema = (AugmentationSchemaNode) effectiveStatement; augmentationsInit.add(augmentationSchema); } - if (effectiveStatement instanceof ChoiceCaseNode) { - final ChoiceCaseNode choiceCaseNode = (ChoiceCaseNode) effectiveStatement; + if (effectiveStatement instanceof CaseSchemaNode) { + final CaseSchemaNode choiceCaseNode = (CaseSchemaNode) effectiveStatement; // FIXME: we may be overwriting a previous entry, is that really okay? casesInit.put(choiceCaseNode.getQName(), choiceCaseNode); } if (YangValidationBundles.SUPPORTED_CASE_SHORTHANDS.contains(effectiveStatement.statementDefinition())) { final DataSchemaNode dataSchemaNode = (DataSchemaNode) effectiveStatement; - final ChoiceCaseNode shorthandCase = new ImplicitChoiceCaseNode(dataSchemaNode); + final CaseSchemaNode shorthandCase = new ImplicitCaseSchemaNode(dataSchemaNode); // FIXME: we may be overwriting a previous entry, is that really okay? casesInit.put(shorthandCase.getQName(), shorthandCase); if (dataSchemaNode.isAugmenting() && !isAugmenting()) { @@ -131,12 +131,12 @@ final class ChoiceEffectiveStatementImpl extends AbstractEffectiveDataSchemaNode } @Override - public SortedMap getCases() { + public SortedMap getCases() { return cases; } @Override - public Optional getDefaultCase() { + public Optional getDefaultCase() { return Optional.ofNullable(defaultCase); } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/choice/ImplicitChoiceCaseNode.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/choice/ImplicitCaseSchemaNode.java similarity index 91% rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/choice/ImplicitChoiceCaseNode.java rename to yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/choice/ImplicitCaseSchemaNode.java index c1eb882ceb..191718cd32 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/choice/ImplicitChoiceCaseNode.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/choice/ImplicitCaseSchemaNode.java @@ -19,7 +19,7 @@ import java.util.Set; import javax.annotation.Nonnull; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; -import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; +import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.DerivableSchemaNode; import org.opendaylight.yangtools.yang.model.api.GroupingDefinition; @@ -32,14 +32,14 @@ import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.UsesNode; // FIXME: hide this somewhere -public final class ImplicitChoiceCaseNode implements ChoiceCaseNode, DerivableSchemaNode { +public final class ImplicitCaseSchemaNode implements CaseSchemaNode, DerivableSchemaNode { private final DataSchemaNode caseShorthandNode; - private final ChoiceCaseNode original; + private final CaseSchemaNode original; private final SchemaPath path; private final boolean augmenting; - public ImplicitChoiceCaseNode(final DataSchemaNode caseShorthandNode) { + public ImplicitCaseSchemaNode(final DataSchemaNode caseShorthandNode) { this.caseShorthandNode = requireNonNull(caseShorthandNode); this.path = requireNonNull(caseShorthandNode.getPath().getParent()); this.original = getOriginalIfPresent(caseShorthandNode); @@ -157,20 +157,20 @@ public final class ImplicitChoiceCaseNode implements ChoiceCaseNode, DerivableSc if (getClass() != obj.getClass()) { return false; } - ImplicitChoiceCaseNode other = (ImplicitChoiceCaseNode) obj; + ImplicitCaseSchemaNode other = (ImplicitCaseSchemaNode) obj; return Objects.equals(getQName(), other.getQName()) && Objects.equals(path, other.path); } @Override public String toString() { - return ImplicitChoiceCaseNode.class.getSimpleName() + "[" + "qname=" + getQName() + "]"; + return ImplicitCaseSchemaNode.class.getSimpleName() + "[" + "qname=" + getQName() + "]"; } - private static ChoiceCaseNode getOriginalIfPresent(final SchemaNode caseShorthandNode) { + private static CaseSchemaNode getOriginalIfPresent(final SchemaNode caseShorthandNode) { if (caseShorthandNode instanceof DerivableSchemaNode) { final Optional original = ((DerivableSchemaNode) caseShorthandNode).getOriginal(); if (original.isPresent()) { - return new ImplicitChoiceCaseNode((DataSchemaNode) original.get()); + return new ImplicitCaseSchemaNode((DataSchemaNode) original.get()); } } return null; diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentProcessTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentProcessTest.java index 92eaad690d..ef7a9192c1 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentProcessTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentProcessTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; -import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; +import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; @@ -182,7 +182,7 @@ public class AugmentProcessTest { final ChoiceSchemaNode lockType = (ChoiceSchemaNode) locks.getDataChildByName(QName .create(ns, rev, "lock-type")); - final ChoiceCaseNode leafAugCase = lockType.findCaseNodes("leaf-aug-case").iterator().next(); + final CaseSchemaNode leafAugCase = lockType.findCaseNodes("leaf-aug-case").iterator().next(); assertTrue(leafAugCase.isAugmenting()); final DataSchemaNode leafAug = leafAugCase.getDataChildByName(QName.create(nsAug, rev, "leaf-aug-case")); assertFalse(leafAug.isAugmenting()); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentTest.java index 9276f72c7f..c4ef3c754b 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentTest.java @@ -24,7 +24,7 @@ import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.common.Revision; import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; -import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; +import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; @@ -155,7 +155,7 @@ public class AugmentTest { assertNotNull(augmentHolder2); assertEquals(1, augment3.getChildNodes().size()); - final ChoiceCaseNode pause = (ChoiceCaseNode) augment3.getDataChildByName(QName.create( + final CaseSchemaNode pause = (CaseSchemaNode) augment3.getDataChildByName(QName.create( module3.getQNameModule(), "pause")); assertNotNull(pause); } @@ -240,15 +240,15 @@ public class AugmentTest { // augment "/br:interfaces/br:ifEntry/bz:augment-holder" final ChoiceSchemaNode odl = (ChoiceSchemaNode) augmentedHolder.getDataChildByName(QName.create(FOO, "odl")); assertNotNull(odl); - final SortedMap cases = odl.getCases(); + final SortedMap cases = odl.getCases(); assertEquals(4, cases.size()); - ChoiceCaseNode id = null; - ChoiceCaseNode node1 = null; - ChoiceCaseNode node2 = null; - ChoiceCaseNode node3 = null; + CaseSchemaNode id = null; + CaseSchemaNode node1 = null; + CaseSchemaNode node2 = null; + CaseSchemaNode node3 = null; - for (final ChoiceCaseNode ccn : cases.values()) { + for (final CaseSchemaNode ccn : cases.values()) { if ("id".equals(ccn.getQName().getLocalName())) { id = ccn; } else if ("node1".equals(ccn.getQName().getLocalName())) { @@ -354,13 +354,13 @@ public class AugmentTest { final QName argumentsQName = QName.create(NS_BAR, revision, "arguments"); assertEquals(argumentsQName, arguments.getQName()); assertFalse(arguments.isAugmenting()); - final SortedMap cases = arguments.getCases(); + final SortedMap cases = arguments.getCases(); assertEquals(3, cases.size()); - ChoiceCaseNode attach = null; - ChoiceCaseNode create = null; - ChoiceCaseNode destroy = null; - for (final ChoiceCaseNode child : cases.values()) { + CaseSchemaNode attach = null; + CaseSchemaNode create = null; + CaseSchemaNode destroy = null; + for (final CaseSchemaNode child : cases.values()) { if ("attach".equals(child.getQName().getLocalName())) { attach = child; } else if ("create".equals(child.getQName().getLocalName())) { diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5884Test.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5884Test.java index 60dccced62..814b4bae23 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5884Test.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5884Test.java @@ -16,7 +16,7 @@ import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.Revision; import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; -import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; +import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; @@ -53,7 +53,7 @@ public class Bug5884Test { while (iterator.hasNext()) { AugmentationSchemaNode allAugments = iterator.next(); final DataSchemaNode currentChoice = allAugments.getChildNodes().iterator().next(); - assertTrue(currentChoice instanceof ChoiceCaseNode); + assertTrue(currentChoice instanceof CaseSchemaNode); } } } \ No newline at end of file diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6183Test.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6183Test.java index 9bf6bc2684..dd1ded710a 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6183Test.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6183Test.java @@ -14,7 +14,7 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; +import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; @@ -50,13 +50,13 @@ public class Bug6183Test { assertEquals(4, myChoice.getCases().size()); - final ChoiceCaseNode implCase = myChoice.getCaseNodeByName(foo("implicit-case-container")); + final CaseSchemaNode implCase = myChoice.getCaseNodeByName(foo("implicit-case-container")); assertNotNull(implCase); - final ChoiceCaseNode declCaseOne = myChoice.getCaseNodeByName(foo("declared-case-one")); + final CaseSchemaNode declCaseOne = myChoice.getCaseNodeByName(foo("declared-case-one")); assertNotNull(declCaseOne); - final ChoiceCaseNode secondImplCase = myChoice.getCaseNodeByName(foo("second-implicit-case-container")); + final CaseSchemaNode secondImplCase = myChoice.getCaseNodeByName(foo("second-implicit-case-container")); assertNotNull(secondImplCase); - final ChoiceCaseNode declCaseTwo = myChoice.getCaseNodeByName(foo("declared-case-two")); + final CaseSchemaNode declCaseTwo = myChoice.getCaseNodeByName(foo("declared-case-two")); assertNotNull(declCaseTwo); assertEquals(1, declCaseOne.getChildNodes().size()); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/CaseStmtTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/CaseStmtTest.java index 16638db0f4..bea2781f90 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/CaseStmtTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/CaseStmtTest.java @@ -20,7 +20,7 @@ import org.junit.rules.ExpectedException; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.common.Revision; -import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; +import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; @@ -37,7 +37,7 @@ public class CaseStmtTest { private DataSchemaNode tempChild; private DataSchemaNode tempSecondChild; private DataSchemaNode tempThirdChild; - private ChoiceCaseNode tempChoice; + private CaseSchemaNode tempChoice; @Rule public ExpectedException expectedEx = ExpectedException.none(); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ChoiceStmtTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ChoiceStmtTest.java index 46734d5786..23d504c51e 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ChoiceStmtTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ChoiceStmtTest.java @@ -13,7 +13,7 @@ import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResour import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; +import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; @@ -48,7 +48,7 @@ public class ChoiceStmtTest { assertNotNull(choice); assertEquals(5, choice.getCases().size()); - ChoiceCaseNode caseNode = choice.findCaseNodes("input").iterator().next(); + CaseSchemaNode caseNode = choice.findCaseNodes("input").iterator().next(); assertNotNull(caseNode); caseNode = choice.findCaseNodes("output").iterator().next(); assertNotNull(caseNode); 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 0fa92b68d5..1aff5ba01c 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 @@ -19,7 +19,7 @@ import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.common.Revision; import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; -import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; +import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; @@ -49,8 +49,8 @@ public class ControllerStmtParserTest { for (final AugmentationSchemaNode augmentationSchema : augmentations) { final DataSchemaNode dataNode = augmentationSchema .getDataChildByName(QName.create(module.getQNameModule(), "dom-broker-impl")); - if (dataNode instanceof ChoiceCaseNode) { - final ChoiceCaseNode caseNode = (ChoiceCaseNode) dataNode; + if (dataNode instanceof CaseSchemaNode) { + final CaseSchemaNode caseNode = (CaseSchemaNode) dataNode; final DataSchemaNode dataNode2 = caseNode .getDataChildByName(QName.create(module.getQNameModule(), "async-data-broker")); if (dataNode2 instanceof ContainerSchemaNode) { @@ -92,7 +92,7 @@ public class ControllerStmtParserTest { assertTrue(dataChildChoice instanceof ChoiceSchemaNode); final ChoiceSchemaNode confChoice = (ChoiceSchemaNode) dataChildChoice; - final ChoiceCaseNode caseNodeByName = confChoice.findCaseNodes("dom-broker-impl").iterator().next(); + final CaseSchemaNode caseNodeByName = confChoice.findCaseNodes("dom-broker-impl").iterator().next(); assertNotNull(caseNodeByName); final DataSchemaNode dataNode2 = caseNodeByName @@ -110,7 +110,7 @@ public class ControllerStmtParserTest { assertEquals(unknownSchemaNode.getQName(), unknownSchemaNode.getPath().getLastComponent()); assertEquals("dom-async-data-broker", unknownSchemaNode.getQName().getLocalName()); - final ChoiceCaseNode domInmemoryDataBroker = confChoice.findCaseNodes("dom-inmemory-data-broker").iterator() + final CaseSchemaNode domInmemoryDataBroker = confChoice.findCaseNodes("dom-inmemory-data-broker").iterator() .next(); assertNotNull(domInmemoryDataBroker); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/GroupingTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/GroupingTest.java index 0168ce568a..2ca353cdc1 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/GroupingTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/GroupingTest.java @@ -29,7 +29,7 @@ import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.common.Revision; import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; -import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; +import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; @@ -295,9 +295,9 @@ public class GroupingTest { assertNotNull(how_u); TestUtils.checkIsAddedByUses(how_u, true); assertFalse(how_u.isAugmenting()); - final SortedMap cases_u = how_u.getCases(); + final SortedMap cases_u = how_u.getCases(); assertEquals(2, cases_u.size()); - final ChoiceCaseNode interval = how_u.findCaseNodes("interval").iterator().next(); + final CaseSchemaNode interval = how_u.findCaseNodes("interval").iterator().next(); assertFalse(interval.isAugmenting()); final LeafSchemaNode name = (LeafSchemaNode) interval.getDataChildByName(QName.create(foo.getQNameModule(), "name")); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TestUtils.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TestUtils.java index fceb6ed379..1f2ba43b3b 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TestUtils.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TestUtils.java @@ -22,7 +22,7 @@ import java.util.Set; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.common.YangConstants; -import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; +import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; @@ -151,7 +151,7 @@ public final class TestUtils { checkIsAugmenting(child, expected); } } else if (node instanceof ChoiceSchemaNode) { - for (ChoiceCaseNode caseNode : ((ChoiceSchemaNode) node).getCases().values()) { + for (CaseSchemaNode caseNode : ((ChoiceSchemaNode) node).getCases().values()) { checkIsAugmenting(caseNode, expected); } } @@ -174,7 +174,7 @@ public final class TestUtils { checkIsAddedByUses(child, expected); } } else if (node instanceof ChoiceSchemaNode) { - for (ChoiceCaseNode caseNode : ((ChoiceSchemaNode) node).getCases().values()) { + for (CaseSchemaNode caseNode : ((ChoiceSchemaNode) node).getCases().values()) { checkIsAddedByUses(caseNode, expected); } } diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserTest.java index 4c8298bd19..0621280a83 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserTest.java @@ -35,7 +35,7 @@ import org.opendaylight.yangtools.yang.common.Revision; import org.opendaylight.yangtools.yang.common.YangConstants; import org.opendaylight.yangtools.yang.common.YangVersion; import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; -import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; +import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; @@ -524,11 +524,11 @@ public class YangParserTest { QName.create(foo.getQNameModule(), "transfer")); final ChoiceSchemaNode how = (ChoiceSchemaNode) transfer.getDataChildByName( QName.create(foo.getQNameModule(), "how")); - final SortedMap cases = how.getCases(); + final SortedMap cases = how.getCases(); assertEquals(5, cases.size()); - ChoiceCaseNode input = null; - ChoiceCaseNode output = null; - for (final ChoiceCaseNode caseNode : cases.values()) { + CaseSchemaNode input = null; + CaseSchemaNode output = null; + for (final CaseSchemaNode caseNode : cases.values()) { if ("input".equals(caseNode.getQName().getLocalName())) { input = caseNode; } else if ("output".equals(caseNode.getQName().getLocalName())) { diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileAugmentStmtTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileAugmentStmtTest.java index bf17ddf1e2..4934afe7b7 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileAugmentStmtTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileAugmentStmtTest.java @@ -19,7 +19,7 @@ import org.junit.Before; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; -import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; +import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; @@ -53,7 +53,7 @@ public class YinFileAugmentStmtTest { + "(urn:opendaylight:params:xml:ns:yang:controller:config?revision=2013-04-05)configuration")); assertEquals(1, augment.getChildNodes().size()); - final ChoiceCaseNode caseNode = (ChoiceCaseNode) augment.getDataChildByName(QName.create( + final CaseSchemaNode caseNode = (CaseSchemaNode) augment.getDataChildByName(QName.create( testModule.getQNameModule(), "main-impl")); assertNotNull(caseNode); } diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileChoiceStmtTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileChoiceStmtTest.java index f37ead3b1d..b5bc99d7b9 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileChoiceStmtTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileChoiceStmtTest.java @@ -18,7 +18,7 @@ import java.util.Iterator; import org.junit.Before; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; +import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.ListSchemaNode; @@ -61,8 +61,8 @@ public class YinFileChoiceStmtTest { assertEquals(1, choice.getCases().size()); // this choice is augmented (see main-impl.yang.xml) - final Iterator casesIterator = choice.getCases().values().iterator(); - final ChoiceCaseNode caseNode = casesIterator.next(); + final Iterator casesIterator = choice.getCases().values().iterator(); + final CaseSchemaNode caseNode = casesIterator.next(); assertEquals("main-impl", caseNode.getQName().getLocalName()); assertEquals(13, caseNode.getChildNodes().size()); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileUsesStmtTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileUsesStmtTest.java index c052c8a0a8..ca40b6bc5a 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileUsesStmtTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileUsesStmtTest.java @@ -19,7 +19,7 @@ import org.junit.Before; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; -import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; +import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; @@ -49,7 +49,7 @@ public class YinFileUsesStmtTest { final Iterator augmentIterator = augmentations.iterator(); final AugmentationSchemaNode augment = augmentIterator.next(); - final ChoiceCaseNode caseNode = (ChoiceCaseNode) augment.getDataChildByName( + final CaseSchemaNode caseNode = (CaseSchemaNode) augment.getDataChildByName( QName.create(testModule.getQNameModule(), "main-impl")); assertNotNull(caseNode); -- 2.36.6