Added support for parsing submodules & added dependency utility parser

[yangtools.git] / yang / yang-parser-impl / src / main / java / org / opendaylight / yangtools / yang / parser / builder / api / AbstractDataNodeContainerBuilder.java

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractDataNodeContainerBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractDataNodeContainerBuilder.java
index 55610d33b664ccaa1c3a3c55139809a3ca9e7f01..39c4c5e78af6883458f551327048b4c4f1b400af 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractDataNodeContainerBuilder.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractDataNodeContainerBuilder.java
@@ -7,7 +7,6 @@
  */
 package org.opendaylight.yangtools.yang.parser.builder.api;
 
-import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Map;
@@ -29,16 +28,16 @@ import org.opendaylight.yangtools.yang.parser.util.YangParseException;
 public abstract class AbstractDataNodeContainerBuilder extends AbstractBuilder implements DataNodeContainerBuilder {
     protected QName qname;
 
-    protected Map<QName, DataSchemaNode> childNodes = new TreeMap<QName, DataSchemaNode>(Comparators.QNAME_COMP);
-    protected final Set<DataSchemaNodeBuilder> addedChildNodes = new HashSet<DataSchemaNodeBuilder>();
+    protected final Map<QName, DataSchemaNode> childNodes = new TreeMap<>(Comparators.QNAME_COMP);
+    protected final Set<DataSchemaNodeBuilder> addedChildNodes = new HashSet<>();
 
-    protected Set<GroupingDefinition> groupings = new TreeSet<GroupingDefinition>(Comparators.SCHEMA_NODE_COMP);
-    protected final Set<GroupingBuilder> addedGroupings = new HashSet<GroupingBuilder>();
+    protected final Set<GroupingDefinition> groupings = new TreeSet<>(Comparators.SCHEMA_NODE_COMP);
+    protected final Set<GroupingBuilder> addedGroupings = new HashSet<>();
 
-    protected Set<TypeDefinition<?>> typedefs = new TreeSet<>(Comparators.SCHEMA_NODE_COMP);
+    protected final Set<TypeDefinition<?>> typedefs = new TreeSet<>(Comparators.SCHEMA_NODE_COMP);
     protected final Set<TypeDefinitionBuilder> addedTypedefs = new HashSet<>();
 
-    protected Set<UsesNode> usesNodes = new HashSet<>();
+    protected final Set<UsesNode> usesNodes = new HashSet<>();
     protected final Set<UsesNodeBuilder> addedUsesNodes = new HashSet<>();
 
     protected AbstractDataNodeContainerBuilder(final String moduleName, final int line, final QName qname) {
@@ -51,12 +50,8 @@ public abstract class AbstractDataNodeContainerBuilder extends AbstractBuilder i
         return qname;
     }
 
-    @Override
-    public Collection<DataSchemaNode> getChildNodes() {
-        if (childNodes == null) {
-            return Collections.emptySet();
-        }
-        return childNodes.values();
+    public Map<QName, DataSchemaNode> getChildNodes() {
+        return childNodes;
     }
 
     @Override
@@ -76,9 +71,9 @@ public abstract class AbstractDataNodeContainerBuilder extends AbstractBuilder i
 
     @Override
     public void addChildNode(DataSchemaNodeBuilder child) {
-        String childName = child.getQName().getLocalName();
+        QName childName = child.getQName();
         for (DataSchemaNodeBuilder addedChildNode : addedChildNodes) {
-            if (addedChildNode.getQName().getLocalName().equals(childName)) {
+            if (addedChildNode.getQName().equals(childName)) {
                 throw new YangParseException(child.getModuleName(), child.getLine(), "Can not add '" + child + "' to '"
                         + this + "' in module '" + moduleName + "': node with same name already declared at line "
                         + addedChildNode.getLine());
@@ -87,6 +82,11 @@ public abstract class AbstractDataNodeContainerBuilder extends AbstractBuilder i
         addedChildNodes.add(child);
     }
 
+    @Override
+    public void addChildNodeToContext(DataSchemaNodeBuilder child) {
+        addedChildNodes.add(child);
+    }
+
     @Override
     public void addChildNode(DataSchemaNode child) {
         QName childName = child.getQName();
@@ -107,19 +107,15 @@ public abstract class AbstractDataNodeContainerBuilder extends AbstractBuilder i
         return groupings;
     }
 
-    public void setGroupings(final Set<GroupingDefinition> groupings) {
-        this.groupings = groupings;
-    }
-
     public Set<GroupingBuilder> getGroupingBuilders() {
         return addedGroupings;
     }
 
     @Override
     public void addGrouping(GroupingBuilder grouping) {
-        String groupingName = grouping.getQName().getLocalName();
+        QName groupingName = grouping.getQName();
         for (GroupingBuilder addedGrouping : addedGroupings) {
-            if (addedGrouping.getQName().getLocalName().equals(groupingName)) {
+            if (addedGrouping.getQName().equals(groupingName)) {
                 throw new YangParseException(grouping.getModuleName(), grouping.getLine(), "Can not add '" + grouping
                         + "': grouping with same name already declared in module '" + moduleName + "' at line "
                         + addedGrouping.getLine());
@@ -129,12 +125,17 @@ public abstract class AbstractDataNodeContainerBuilder extends AbstractBuilder i
     }
 
     @Override
-    public Set<UsesNodeBuilder> getUsesNodes() {
-        return addedUsesNodes;
+    public Set<TypeDefinition<?>> getTypeDefinitions() {
+        return typedefs;
     }
 
-    public void setUsesnodes(final Set<UsesNode> usesNodes) {
-        this.usesNodes = usesNodes;
+    public Set<UsesNode> getUsesNodes() {
+        return usesNodes;
+    }
+
+    @Override
+    public Set<UsesNodeBuilder> getUsesNodeBuilders() {
+        return addedUsesNodes;
     }
 
     @Override