CodeGenerator update.

[controller.git] / opendaylight / sal / yang-prototype / code-generator / maven-yang-plugin / src / main / java / org / opendaylight / controller / yang2sources / plugin / YangToSourcesMojo.java

diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin/src/main/java/org/opendaylight/controller/yang2sources/plugin/YangToSourcesMojo.java b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin/src/main/java/org/opendaylight/controller/yang2sources/plugin/YangToSourcesMojo.java
index ab49a54fd1fa809a439ab42cc8c731973227cb54..f8117c077ed807a0f5ceafdad138e7dc5a808bb0 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin/src/main/java/org/opendaylight/controller/yang2sources/plugin/YangToSourcesMojo.java
+++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin/src/main/java/org/opendaylight/controller/yang2sources/plugin/YangToSourcesMojo.java
@@ -133,11 +133,6 @@ public final class YangToSourcesMojo extends AbstractMojo {
             Set<Module> yangModules = parser
                     .parseYangModelsFromStreams(yangFiles);
 
-            Set<String> yangModulesNames = new HashSet<String>();
-            for (Module module : yangModules) {
-                yangModulesNames.add(module.getName());
-            }
-
             List<InputStream> yangFilesFromDependencies = getFilesFromDependenciesAsStream();
             Set<Module> yangModulesFromDependencies = parser
                     .parseYangModelsFromStreams(yangFilesFromDependencies);
@@ -150,8 +145,8 @@ public final class YangToSourcesMojo extends AbstractMojo {
                         Util.message(
                                 "No %s file found in %s or in dependencies",
                                 LOG_PREFIX, Util.YANG_SUFFIX, yangFilesRootDir));
-                Set<String> names = Collections.emptySet();
-                return new ContextHolder(null, names);
+                Set<Module> modules = Collections.emptySet();
+                return new ContextHolder(null, modules);
             }
 
             SchemaContext resolveSchemaContext = parser
@@ -159,7 +154,7 @@ public final class YangToSourcesMojo extends AbstractMojo {
             getLog().info(
                     Util.message("%s files parsed from %s", LOG_PREFIX,
                             Util.YANG_SUFFIX, yangFiles));
-            return new ContextHolder(resolveSchemaContext, yangModulesNames);
+            return new ContextHolder(resolveSchemaContext, yangModules);
 
             // MojoExecutionException is thrown since execution cannot continue
         } catch (Exception e) {
@@ -389,7 +384,7 @@ public final class YangToSourcesMojo extends AbstractMojo {
             project.addCompileSourceRoot(outputDir.getPath());
         }
         Collection<File> generated = g.generateSources(context.getContext(),
-                outputDir, context.getYangModulesNames());
+                outputDir, context.getYangModules());
         getLog().info(
                 Util.message("Sources generated by %s: %s", LOG_PREFIX,
                         codeGeneratorCfg.getCodeGeneratorClass(), generated));
@@ -455,20 +450,20 @@ public final class YangToSourcesMojo extends AbstractMojo {
 
     private class ContextHolder {
         private final SchemaContext context;
-        private final Set<String> yangModulesNames;
+        private final Set<Module> yangModules;
 
         private ContextHolder(SchemaContext context,
-                Set<String> yangModulesNames) {
+                Set<Module> yangModules) {
             this.context = context;
-            this.yangModulesNames = yangModulesNames;
+            this.yangModules = yangModules;
         }
 
         public SchemaContext getContext() {
             return context;
         }
 
-        public Set<String> getYangModulesNames() {
-            return yangModulesNames;
+        public Set<Module> getYangModules() {
+            return yangModules;
         }
     }