Make buildModules() in YangParser behave same as other methods

Submodules were not resolved

Change-Id: Ifaac3b7f95883f190874cf91f8837c697c6c33e7
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java
index d0335a4667889c4e9d40ca86a703700ac01a2b35..1ed5986df5c75d4f53f162f2988ad2a4f844256a 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java
@@ -329,10 +329,10 @@ public final class YangParserImpl implements YangContextParser {
     }
 
     public Collection<Module> buildModules(final Collection<ModuleBuilder> builders) {
-        List<ModuleBuilder> sorted = ModuleDependencySort.sort(builders);
+        Collection<ModuleBuilder> unsorted = resolveSubmodules(builders);
+        List<ModuleBuilder> sorted = ModuleDependencySort.sort(unsorted);
         Map<URI, TreeMap<Date, ModuleBuilder>> modules = resolveModulesWithImports(sorted, null);
         Map<ModuleBuilder, Module> builderToModule = build(modules);
-
         return builderToModule.values();
     }