Merge "Improved sorting of augmentations before code generation."

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

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleBuilder.java
index ced7b3ab393dfce4c1035bbe68c6cc74a63a5f84..e8716365d4adf6a88d16734074d1cd5055507ae2 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleBuilder.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleBuilder.java
@@ -7,6 +7,18 @@
  */
 package org.opendaylight.yangtools.yang.parser.builder.impl;
 
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.Deque;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
+
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.AugmentationSchema;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
@@ -38,17 +50,6 @@ import org.opendaylight.yangtools.yang.parser.util.ModuleImportImpl;
 import org.opendaylight.yangtools.yang.parser.util.RefineHolder;
 import org.opendaylight.yangtools.yang.parser.util.YangParseException;
 
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.Deque;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-
 /**
  * Builder of Module object. If this module is dependent on external
  * module/modules, these dependencies must be resolved before module is built,
@@ -68,11 +69,12 @@ public class ModuleBuilder extends AbstractDataNodeContainerBuilder {
     private String belongsTo;
     private ModuleBuilder parent;
 
-    public ModuleBuilder getParent() {
+    @Override
+       public ModuleBuilder getParent() {
         return parent;
     }
 
-    public void setParent(ModuleBuilder parent) {
+    public void setParent(final ModuleBuilder parent) {
         this.parent = parent;
     }
 
@@ -81,7 +83,7 @@ public class ModuleBuilder extends AbstractDataNodeContainerBuilder {
 
     private final Set<ModuleImport> imports = new HashSet<ModuleImport>();
 
-    private final Set<AugmentationSchema> augments = new HashSet<>();
+    private final Set<AugmentationSchema> augments = new LinkedHashSet<>();
     private final List<AugmentationSchemaBuilder> augmentBuilders = new ArrayList<>();
     private final List<AugmentationSchemaBuilder> allAugments = new ArrayList<>();
 
@@ -121,17 +123,17 @@ public class ModuleBuilder extends AbstractDataNodeContainerBuilder {
         super(name, 0, null);
         this.name = name;
         this.sourcePath = sourcePath;
-        schemaPath = new SchemaPath(Collections.<QName> emptyList(), true);
+        schemaPath = SchemaPath.create(Collections.<QName> emptyList(), true);
         this.submodule = submodule;
         instance = new ModuleImpl(name, sourcePath);
         actualPath.push(this);
     }
 
-    public ModuleBuilder(Module base) {
+    public ModuleBuilder(final Module base) {
         super(base.getName(), 0, null);
         this.name = base.getName();
         this.sourcePath = base.getModuleSourcePath();
-        schemaPath = new SchemaPath(Collections.<QName> emptyList(), true);
+        schemaPath = SchemaPath.create(Collections.<QName> emptyList(), true);
         submodule = false;
         instance = new ModuleImpl(base.getName(), base.getModuleSourcePath());
         instance.setYangVersion(base.getYangVersion());
@@ -255,7 +257,7 @@ public class ModuleBuilder extends AbstractDataNodeContainerBuilder {
     }
 
     @Override
-    public void setParent(Builder parent) {
+    public void setParent(final Builder parent) {
         throw new YangParseException(name, 0, "Can not set parent to module");
     }
 
@@ -377,7 +379,7 @@ public class ModuleBuilder extends AbstractDataNodeContainerBuilder {
         return belongsTo;
     }
 
-    public void setBelongsTo(String belongsTo) {
+    public void setBelongsTo(final String belongsTo) {
         this.belongsTo = belongsTo;
     }
 
@@ -522,8 +524,8 @@ public class ModuleBuilder extends AbstractDataNodeContainerBuilder {
         return builder;
     }
 
-    public AugmentationSchemaBuilder addAugment(final int line, final String augmentTargetStr) {
-        final AugmentationSchemaBuilder builder = new AugmentationSchemaBuilderImpl(name, line, augmentTargetStr);
+    public AugmentationSchemaBuilder addAugment(final int line, final String augmentTargetStr, final int order) {
+        final AugmentationSchemaBuilder builder = new AugmentationSchemaBuilderImpl(name, line, augmentTargetStr, order);
 
         Builder parent = getActualNode();
         builder.setParent(parent);
@@ -556,7 +558,7 @@ public class ModuleBuilder extends AbstractDataNodeContainerBuilder {
     }
 
     @Override
-    public void addUsesNode(UsesNodeBuilder usesBuilder) {
+    public void addUsesNode(final UsesNodeBuilder usesBuilder) {
         addedUsesNodes.add(usesBuilder);
         allUsesNodes.add(usesBuilder);
     }
@@ -649,7 +651,7 @@ public class ModuleBuilder extends AbstractDataNodeContainerBuilder {
         return outputBuilder;
     }
 
-    public void addNotification(NotificationDefinition notification) {
+    public void addNotification(final NotificationDefinition notification) {
         notifications.add(notification);
     }
 
@@ -743,7 +745,7 @@ public class ModuleBuilder extends AbstractDataNodeContainerBuilder {
     }
 
     @Override
-    public void addTypedef(TypeDefinitionBuilder typedefBuilder) {
+    public void addTypedef(final TypeDefinitionBuilder typedefBuilder) {
         String nodeName = typedefBuilder.getQName().getLocalName();
         for (TypeDefinitionBuilder tdb : addedTypedefs) {
             if (tdb.getQName().getLocalName().equals(nodeName)) {
@@ -914,7 +916,7 @@ public class ModuleBuilder extends AbstractDataNodeContainerBuilder {
         return "module " + name;
     }
 
-    public void setSource(String source) {
+    public void setSource(final String source) {
         this.source = source;
     }
 
@@ -944,7 +946,7 @@ public class ModuleBuilder extends AbstractDataNodeContainerBuilder {
         private final List<UnknownSchemaNode> unknownNodes = new ArrayList<>();
         private String source;
 
-        private ModuleImpl(String name, String sourcePath) {
+        private ModuleImpl(final String name, final String sourcePath) {
             this.name = name;
             this.sourcePath = sourcePath;
         }
@@ -959,7 +961,7 @@ public class ModuleBuilder extends AbstractDataNodeContainerBuilder {
             return namespace;
         }
 
-        private void setNamespace(URI namespace) {
+        private void setNamespace(final URI namespace) {
             this.namespace = namespace;
         }
 
@@ -973,7 +975,7 @@ public class ModuleBuilder extends AbstractDataNodeContainerBuilder {
             return revision;
         }
 
-        private void setRevision(Date revision) {
+        private void setRevision(final Date revision) {
             this.revision = revision;
         }
 
@@ -982,7 +984,7 @@ public class ModuleBuilder extends AbstractDataNodeContainerBuilder {
             return prefix;
         }
 
-        private void setPrefix(String prefix) {
+        private void setPrefix(final String prefix) {
             this.prefix = prefix;
         }
 
@@ -991,7 +993,7 @@ public class ModuleBuilder extends AbstractDataNodeContainerBuilder {
             return yangVersion;
         }
 
-        private void setYangVersion(String yangVersion) {
+        private void setYangVersion(final String yangVersion) {
             this.yangVersion = yangVersion;
         }
 
@@ -1000,7 +1002,7 @@ public class ModuleBuilder extends AbstractDataNodeContainerBuilder {
             return description;
         }
 
-        private void setDescription(String description) {
+        private void setDescription(final String description) {
             this.description = description;
         }
 
@@ -1009,7 +1011,7 @@ public class ModuleBuilder extends AbstractDataNodeContainerBuilder {
             return reference;
         }
 
-        private void setReference(String reference) {
+        private void setReference(final String reference) {
             this.reference = reference;
         }
 
@@ -1018,7 +1020,7 @@ public class ModuleBuilder extends AbstractDataNodeContainerBuilder {
             return organization;
         }
 
-        private void setOrganization(String organization) {
+        private void setOrganization(final String organization) {
             this.organization = organization;
         }
 
@@ -1027,7 +1029,7 @@ public class ModuleBuilder extends AbstractDataNodeContainerBuilder {
             return contact;
         }
 
-        private void setContact(String contact) {
+        private void setContact(final String contact) {
             this.contact = contact;
         }
 
@@ -1036,7 +1038,7 @@ public class ModuleBuilder extends AbstractDataNodeContainerBuilder {
             return imports;
         }
 
-        private void setImports(Set<ModuleImport> imports) {
+        private void setImports(final Set<ModuleImport> imports) {
             if (imports != null) {
                 this.imports.addAll(imports);
             }
@@ -1047,7 +1049,7 @@ public class ModuleBuilder extends AbstractDataNodeContainerBuilder {
             return features;
         }
 
-        private void setFeatures(Set<FeatureDefinition> features) {
+        private void setFeatures(final Set<FeatureDefinition> features) {
             if (features != null) {
                 this.features.addAll(features);
             }
@@ -1058,7 +1060,7 @@ public class ModuleBuilder extends AbstractDataNodeContainerBuilder {
             return typeDefinitions;
         }
 
-        private void setTypeDefinitions(Set<TypeDefinition<?>> typeDefinitions) {
+        private void setTypeDefinitions(final Set<TypeDefinition<?>> typeDefinitions) {
             if (typeDefinitions != null) {
                 this.typeDefinitions.addAll(typeDefinitions);
             }
@@ -1069,7 +1071,7 @@ public class ModuleBuilder extends AbstractDataNodeContainerBuilder {
             return notifications;
         }
 
-        private void setNotifications(Set<NotificationDefinition> notifications) {
+        private void setNotifications(final Set<NotificationDefinition> notifications) {
             if (notifications != null) {
                 this.notifications.addAll(notifications);
             }
@@ -1080,7 +1082,7 @@ public class ModuleBuilder extends AbstractDataNodeContainerBuilder {
             return augmentations;
         }
 
-        private void setAugmentations(Set<AugmentationSchema> augmentations) {
+        private void setAugmentations(final Set<AugmentationSchema> augmentations) {
             if (augmentations != null) {
                 this.augmentations.addAll(augmentations);
             }
@@ -1091,7 +1093,7 @@ public class ModuleBuilder extends AbstractDataNodeContainerBuilder {
             return rpcs;
         }
 
-        private void setRpcs(Set<RpcDefinition> rpcs) {
+        private void setRpcs(final Set<RpcDefinition> rpcs) {
             if (rpcs != null) {
                 this.rpcs.addAll(rpcs);
             }
@@ -1102,7 +1104,7 @@ public class ModuleBuilder extends AbstractDataNodeContainerBuilder {
             return deviations;
         }
 
-        private void setDeviations(Set<Deviation> deviations) {
+        private void setDeviations(final Set<Deviation> deviations) {
             if (deviations != null) {
                 this.deviations.addAll(deviations);
             }
@@ -1113,7 +1115,7 @@ public class ModuleBuilder extends AbstractDataNodeContainerBuilder {
             return Collections.unmodifiableSet(childNodes);
         }
 
-        private void addChildNodes(Set<DataSchemaNode> childNodes) {
+        private void addChildNodes(final Set<DataSchemaNode> childNodes) {
             if (childNodes != null) {
                 this.childNodes.addAll(childNodes);
             }
@@ -1124,7 +1126,7 @@ public class ModuleBuilder extends AbstractDataNodeContainerBuilder {
             return groupings;
         }
 
-        private void setGroupings(Set<GroupingDefinition> groupings) {
+        private void setGroupings(final Set<GroupingDefinition> groupings) {
             if (groupings != null) {
                 this.groupings.addAll(groupings);
             }
@@ -1135,7 +1137,7 @@ public class ModuleBuilder extends AbstractDataNodeContainerBuilder {
             return uses;
         }
 
-        private void setUses(Set<UsesNode> uses) {
+        private void setUses(final Set<UsesNode> uses) {
             if (uses != null) {
                 this.uses.addAll(uses);
             }
@@ -1176,16 +1178,16 @@ public class ModuleBuilder extends AbstractDataNodeContainerBuilder {
         }
 
         @Override
-        public DataSchemaNode getDataChildByName(QName name) {
+        public DataSchemaNode getDataChildByName(final QName name) {
             return getChildNode(childNodes, name);
         }
 
         @Override
-        public DataSchemaNode getDataChildByName(String name) {
+        public DataSchemaNode getDataChildByName(final String name) {
             return getChildNode(childNodes, name);
         }
 
-        void setSource(String source){
+        void setSource(final String source){
             this.source = source;
         }
 
@@ -1193,7 +1195,6 @@ public class ModuleBuilder extends AbstractDataNodeContainerBuilder {
             return source;
         }
 
-        // FIXME: perhaps namespace should not be taken into consideration
         @Override
         public int hashCode() {
             final int prime = 31;
@@ -1206,7 +1207,7 @@ public class ModuleBuilder extends AbstractDataNodeContainerBuilder {
         }
 
         @Override
-        public boolean equals(Object obj) {
+        public boolean equals(final Object obj) {
             if (this == obj) {
                 return true;
             }
@@ -1395,7 +1396,7 @@ public class ModuleBuilder extends AbstractDataNodeContainerBuilder {
     }
 
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals(final Object obj) {
         if (this == obj) {
             return true;
         }