BUG-1513: finish migration of ChoiceNodes

This migrates the leftover users to make them work correctly.

Change-Id: I134c82d29a6b192455f670d2f1a9477a688fff25
Signed-off-by: Robert Varga <rovarga@cisco.com>

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 d75c5657bf1bceecc4be7925a286e9fbca481178..c36638463c07465f9ed6740ccb390806d9cbecfc 100644 (file)
--- 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 58db208f1b26bb6b8d5eb8acf14b197827f84a9c..424c64b081ebff70b0841a2bcba368f2c9c02194 100644 (file)
--- 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 @@
  *   <dd>{@link org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode}
  *
  * <dt>choice
- *   <dd>{@link org.opendaylight.yangtools.yang.model.api.ChoiceNode}
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode}
  *
  * <dt>config
  *   <dd>{@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 6ef96bffe983d3de03caf5294d37e9e7d84f3a5f..4e87fa2641fe503656a1a9154a153387f05d918f 100644 (file)
--- 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())) {