Merge "Moved parsing of unknown nodes from implementation to abstract classes."

[controller.git] / opendaylight / sal / yang-prototype / code-generator / yang-model-parser-impl / src / main / java / org / opendaylight / controller / yang / parser / builder / impl / ChoiceBuilder.java

diff --git a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/ChoiceBuilder.java b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/ChoiceBuilder.java
index 1b4283a46313dbf740c1f2c3b2f1e7594557cda4..0fcfd339a583f95eb9fa7570404f3651922e0f58 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/ChoiceBuilder.java
+++ b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/ChoiceBuilder.java
@@ -25,18 +25,15 @@ import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;
 import org.opendaylight.controller.yang.parser.builder.api.AbstractSchemaNodeBuilder;
 import org.opendaylight.controller.yang.parser.builder.api.AugmentationSchemaBuilder;
 import org.opendaylight.controller.yang.parser.builder.api.AugmentationTargetBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.ConfigNode;
 import org.opendaylight.controller.yang.parser.builder.api.DataSchemaNodeBuilder;
 import org.opendaylight.controller.yang.parser.builder.api.GroupingMember;
 import org.opendaylight.controller.yang.parser.util.Comparators;
 import org.opendaylight.controller.yang.parser.util.ParserUtils;
 
 public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements DataSchemaNodeBuilder,
-        AugmentationTargetBuilder, GroupingMember, ConfigNode {
+        AugmentationTargetBuilder, GroupingMember {
     private boolean isBuilt;
     private final ChoiceNodeImpl instance;
-    // SchemaNode args
-    private List<UnknownSchemaNode> unknownNodes;
     // DataSchemaNode args
     private boolean augmenting;
     private boolean addedByUses;
@@ -132,7 +129,7 @@ public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements Da
     public void addChildNode(DataSchemaNodeBuilder childNode) {
         if (!(childNode instanceof ChoiceCaseBuilder)) {
             ChoiceCaseBuilder caseBuilder = new ChoiceCaseBuilder(childNode.getLine(), childNode.getQName());
-            if(childNode.isAugmenting()) {
+            if (childNode.isAugmenting()) {
                 caseBuilder.setAugmenting(true);
                 childNode.setAugmenting(false);
             }
@@ -197,10 +194,6 @@ public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements Da
         return addedUnknownNodes;
     }
 
-    public void setUnknownNodes(List<UnknownSchemaNode> unknownNodes) {
-        this.unknownNodes = unknownNodes;
-    }
-
     public String getDefaultCase() {
         return defaultCase;
     }
@@ -376,6 +369,36 @@ public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements Da
             return cases;
         }
 
+        @Override
+        public ChoiceCaseNode getCaseNodeByName(final QName name) {
+            if (name == null) {
+                throw new IllegalArgumentException("Choice Case QName cannot be NULL!");
+            }
+            for (final ChoiceCaseNode caseNode : cases) {
+                if (caseNode != null) {
+                    if (name.equals(caseNode.getQName())) {
+                        return caseNode;
+                    }
+                }
+            }
+            return null;
+        }
+
+        @Override
+        public ChoiceCaseNode getCaseNodeByName(final String name) {
+            if (name == null) {
+                throw new IllegalArgumentException("Choice Case string Name cannot be NULL!");
+            }
+            for (final ChoiceCaseNode caseNode : cases) {
+                if (caseNode != null && (caseNode.getQName() != null)) {
+                    if (name.equals(caseNode.getQName().getLocalName())) {
+                        return caseNode;
+                    }
+                }
+            }
+            return null;
+        }
+
         private void setCases(Set<ChoiceCaseNode> cases) {
             if (cases != null) {
                 this.cases = cases;