From 2fdf3d686b208a62ec713a469cb5a8af4e6fb235 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 11 Mar 2015 10:21:42 +0100 Subject: [PATCH] BUG-1513: finish migration of ChoiceNodes This migrates the leftover users to make them work correctly. Change-Id: I134c82d29a6b192455f670d2f1a9477a688fff25 Signed-off-by: Robert Varga --- .../tests/MultipleRevisionsSupportTest.java | 6 +++--- .../yangtools/yang/model/api/package-info.java | 2 +- .../yang/model/export/SchemaContextEmitter.java | 16 ++++++++-------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/integration-test/yang-runtime-tests/src/test/java/org/opendaylight/yangtools/it/yang/runtime/tests/MultipleRevisionsSupportTest.java b/integration-test/yang-runtime-tests/src/test/java/org/opendaylight/yangtools/it/yang/runtime/tests/MultipleRevisionsSupportTest.java index d75c5657bf..c36638463c 100644 --- a/integration-test/yang-runtime-tests/src/test/java/org/opendaylight/yangtools/it/yang/runtime/tests/MultipleRevisionsSupportTest.java +++ b/integration-test/yang-runtime-tests/src/test/java/org/opendaylight/yangtools/it/yang/runtime/tests/MultipleRevisionsSupportTest.java @@ -26,7 +26,7 @@ import org.opendaylight.yangtools.sal.binding.generator.impl.BindingGeneratorImp import org.opendaylight.yangtools.sal.binding.generator.impl.ModuleContext; import org.opendaylight.yangtools.yang.binding.YangModuleInfo; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.model.api.ChoiceNode; +import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; @@ -162,8 +162,8 @@ public class MultipleRevisionsSupportTest { for (DataSchemaNode child : ((DataNodeContainer) node).getChildNodes()) { assertDeepRevision(revision, child); } - } else if (node instanceof ChoiceNode) { - for (DataSchemaNode child : ((ChoiceNode) node).getCases()) { + } else if (node instanceof ChoiceSchemaNode) { + for (DataSchemaNode child : ((ChoiceSchemaNode) node).getCases()) { assertDeepRevision(revision, child); } } 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 58db208f1b..424c64b081 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 @@ -54,7 +54,7 @@ *
{@link org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode} * *
choice - *
{@link org.opendaylight.yangtools.yang.model.api.ChoiceNode} + *
{@link org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode} * *
config *
{@link org.opendaylight.yangtools.yang.model.api.DataSchemaNode#isConfiguration()} 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 6ef96bffe9..4e87fa2641 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 @@ -26,7 +26,7 @@ import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; import org.opendaylight.yangtools.yang.model.api.AugmentationSchema; import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; -import org.opendaylight.yangtools.yang.model.api.ChoiceNode; +import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.ConstraintDefinition; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; @@ -222,8 +222,8 @@ class SchemaContextEmitter { emitLeafList((LeafListSchemaNode) child); } else if (child instanceof ListSchemaNode) { emitList((ListSchemaNode) child); - } else if (child instanceof ChoiceNode) { - emitChoice((ChoiceNode) child); + } else if (child instanceof ChoiceSchemaNode) { + emitChoice((ChoiceSchemaNode) child); } else if (child instanceof AnyXmlSchemaNode) { emitAnyxml((AnyXmlSchemaNode) child); } else { @@ -852,7 +852,7 @@ class SchemaContextEmitter { } - private void emitChoice(final ChoiceNode choice) { + private void emitChoice(final ChoiceSchemaNode choice) { writer.startChoiceNode(choice.getQName()); emitWhen(choice.getConstraints().getWhenCondition()); // FIXME: BUG-2444: *(ifFeatureNode ) @@ -928,8 +928,8 @@ class SchemaContextEmitter { emitRefineLeafListNodes((LeafListSchemaNode) value); } else if (value instanceof ListSchemaNode) { emitRefineListNodes((ListSchemaNode) value); - } else if (value instanceof ChoiceNode) { - emitRefineChoiceNodes((ChoiceNode) value); + } else if (value instanceof ChoiceSchemaNode) { + emitRefineChoiceNodes((ChoiceSchemaNode) value); } else if (value instanceof ChoiceCaseNode) { emitRefineCaseNodes((ChoiceCaseNode) value); } else if (value instanceof ContainerSchemaNode) { @@ -1023,8 +1023,8 @@ class SchemaContextEmitter { } - private void emitRefineChoiceNodes(final ChoiceNode value) { - final ChoiceNode original = getOriginalChecked(value); + private void emitRefineChoiceNodes(final ChoiceSchemaNode value) { + final ChoiceSchemaNode original = getOriginalChecked(value); // FIXME: BUG-2444: defaultNode //FIXME: BUG-2444: Optional if (Objects.deepEquals(original.isConfiguration(), value.isConfiguration())) { -- 2.36.6