Bug 6771: Problem with typedefs nested in augment

[yangtools.git] / yang / yang-parser-impl / src / main / java / org / opendaylight / yangtools / yang / parser / stmt / rfc6020 / effective / AbstractEffectiveModule.java

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/AbstractEffectiveModule.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/AbstractEffectiveModule.java
index ff01174c5506801ad42e942b8812fcde05f2c65a..883b54cd5c5b9432dac4b11dcbc887919fc117c5 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/AbstractEffectiveModule.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/AbstractEffectiveModule.java
@@ -11,12 +11,12 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import java.net.URI;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -42,7 +42,6 @@ import org.opendaylight.yangtools.yang.model.api.UsesNode;
 import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.SubmoduleStatement;
-import org.opendaylight.yangtools.yang.model.util.ExtendedType;
 import org.opendaylight.yangtools.yang.model.util.ModuleImportImpl;
 import org.opendaylight.yangtools.yang.parser.spi.SubmoduleNamespace;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
@@ -110,11 +109,12 @@ abstract class AbstractEffectiveModule<D extends DeclaredStatement<String>> exte
         } else {
             Collection<ModuleIdentifier> includedSubmodules = includedSubmodulesMap.values();
             Set<Module> submodulesInit = new HashSet<>();
-            List<EffectiveStatement<?, ?>> substatementsOfSubmodulesInit = new LinkedList<>();
+            List<EffectiveStatement<?, ?>> substatementsOfSubmodulesInit = new ArrayList<>();
             for (ModuleIdentifier submoduleIdentifier : includedSubmodules) {
                 @SuppressWarnings("unchecked")
-                Mutable<String, SubmoduleStatement, EffectiveStatement<String, SubmoduleStatement>> submoduleCtx = (Mutable<String, SubmoduleStatement, EffectiveStatement<String, SubmoduleStatement>>) ctx
-                        .getFromNamespace(SubmoduleNamespace.class, submoduleIdentifier);
+                Mutable<String, SubmoduleStatement, EffectiveStatement<String, SubmoduleStatement>> submoduleCtx =
+                    (Mutable<String, SubmoduleStatement, EffectiveStatement<String, SubmoduleStatement>>)
+                        ctx.getFromNamespace(SubmoduleNamespace.class, submoduleIdentifier);
                 SubmoduleEffectiveStatementImpl submodule = (SubmoduleEffectiveStatementImpl) submoduleCtx
                         .buildEffective();
                 submodulesInit.add(submodule);
@@ -126,20 +126,19 @@ abstract class AbstractEffectiveModule<D extends DeclaredStatement<String>> exte
         }
 
         // init substatements collections
-        List<EffectiveStatement<?, ?>> effectiveSubstatements = new LinkedList<>();
-
+        List<EffectiveStatement<?, ?>> effectiveSubstatements = new ArrayList<>();
         effectiveSubstatements.addAll(effectiveSubstatements());
         effectiveSubstatements.addAll(substatementsOfSubmodules);
 
-        List<UnknownSchemaNode> unknownNodesInit = new LinkedList<>();
-        Set<AugmentationSchema> augmentationsInit = new HashSet<>();
+        List<UnknownSchemaNode> unknownNodesInit = new ArrayList<>();
+        Set<AugmentationSchema> augmentationsInit = new LinkedHashSet<>();
         Set<ModuleImport> importsInit = new HashSet<>();
         Set<NotificationDefinition> notificationsInit = new HashSet<>();
         Set<RpcDefinition> rpcsInit = new HashSet<>();
         Set<Deviation> deviationsInit = new HashSet<>();
         Set<IdentitySchemaNode> identitiesInit = new HashSet<>();
         Set<FeatureDefinition> featuresInit = new HashSet<>();
-        List<ExtensionDefinition> extensionNodesInit = new LinkedList<>();
+        List<ExtensionDefinition> extensionNodesInit = new ArrayList<>();
 
         Map<QName, DataSchemaNode> mutableChildNodes = new LinkedHashMap<>();
         Set<GroupingDefinition> mutableGroupings = new HashSet<>();
@@ -172,8 +171,11 @@ abstract class AbstractEffectiveModule<D extends DeclaredStatement<String>> exte
             if (effectiveStatement instanceof FeatureDefinition) {
                 featuresInit.add((FeatureDefinition) effectiveStatement);
             }
-            if (effectiveStatement instanceof ExtensionDefinition) {
-                extensionNodesInit.add((ExtensionDefinition) effectiveStatement);
+            if (effectiveStatement instanceof ExtensionEffectiveStatementImpl) {
+                ExtensionEffectiveStatementImpl extensionDefinition = (ExtensionEffectiveStatementImpl) effectiveStatement;
+                extensionDefinition.initUnknownSchemaNodes();
+                extensionNodesInit
+                        .add(extensionDefinition);
             }
             if (effectiveStatement instanceof DataSchemaNode) {
                 DataSchemaNode dataSchemaNode = (DataSchemaNode) effectiveStatement;
@@ -194,9 +196,9 @@ abstract class AbstractEffectiveModule<D extends DeclaredStatement<String>> exte
             }
             if (effectiveStatement instanceof TypeDefEffectiveStatementImpl) {
                 TypeDefEffectiveStatementImpl typeDef = (TypeDefEffectiveStatementImpl) effectiveStatement;
-                ExtendedType extendedType = typeDef.buildType();
-                if (!mutableTypeDefinitions.contains(extendedType)) {
-                    mutableTypeDefinitions.add(extendedType);
+                TypeDefinition<?> type = typeDef.getTypeDefinition();
+                if (!mutableTypeDefinitions.contains(type)) {
+                    mutableTypeDefinitions.add(type);
                 } else {
                     throw EffectiveStmtUtils.createNameCollisionSourceException(ctx, effectiveStatement);
                 }