Fixed bug in maven-yang-plugin.

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

diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin/src/main/java/org/opendaylight/controller/yang2sources/plugin/YangToSourcesProcessor.java b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin/src/main/java/org/opendaylight/controller/yang2sources/plugin/YangToSourcesProcessor.java
index 770eeee964895bd0714cdc00eb0e08d7850923cf..cc7c5363422546ca727affb756c82d6a61c8cb0f 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin/src/main/java/org/opendaylight/controller/yang2sources/plugin/YangToSourcesProcessor.java
+++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin/src/main/java/org/opendaylight/controller/yang2sources/plugin/YangToSourcesProcessor.java
@@ -40,6 +40,7 @@ class YangToSourcesProcessor {
     static final String LOG_PREFIX = "yang-to-sources:";
     static final String META_INF_YANG_STRING = "META-INF" + File.separator
             + "yang";
+    static final String META_INF_YANG_STRING_JAR = "META-INF" + "/" + "yang";
     static final File META_INF_YANG_DIR = new File(META_INF_YANG_STRING);
 
     private final Log log;
@@ -51,8 +52,8 @@ class YangToSourcesProcessor {
 
     @VisibleForTesting
     YangToSourcesProcessor(Log log, File yangFilesRootDir,
-            List<CodeGeneratorArg> codeGenerators, MavenProject project,
-            boolean inspectDependencies, YangProvider yangProvider) {
+                           List<CodeGeneratorArg> codeGenerators, MavenProject project,
+                           boolean inspectDependencies, YangProvider yangProvider) {
         this.log = Util.checkNotNull(log, "log");
         this.yangFilesRootDir = Util.checkNotNull(yangFilesRootDir,
                 "yangFilesRootDir");
@@ -64,8 +65,8 @@ class YangToSourcesProcessor {
     }
 
     YangToSourcesProcessor(Log log, File yangFilesRootDir,
-            List<CodeGeneratorArg> codeGenerators, MavenProject project,
-            boolean inspectDependencies) {
+                           List<CodeGeneratorArg> codeGenerators, MavenProject project,
+                           boolean inspectDependencies) {
         this(log, yangFilesRootDir, codeGenerators, project,
                 inspectDependencies, new YangProvider());
     }
@@ -132,7 +133,7 @@ class YangToSourcesProcessor {
                 + "yang";
 
         void addYangsToMETA_INF(Log log, MavenProject project,
-                File yangFilesRootDir) throws MojoFailureException {
+                                File yangFilesRootDir) throws MojoFailureException {
             File targetYangDir = new File(project.getBasedir(), yangResourceDir);
 
             try {
@@ -143,15 +144,15 @@ class YangToSourcesProcessor {
                 throw new MojoFailureException(message, e);
             }
 
-            setResource(targetYangDir, META_INF_YANG_DIR.getPath(), project);
+            setResource(targetYangDir, META_INF_YANG_STRING_JAR, project);
 
             log.debug(Util.message(
                     "Yang files from: %s marked as resources: %s", LOG_PREFIX,
-                    yangFilesRootDir, META_INF_YANG_DIR.getPath()));
+                    yangFilesRootDir, META_INF_YANG_STRING_JAR));
         }
 
         private static void setResource(File targetYangDir, String targetPath,
-                MavenProject project) {
+                                        MavenProject project) {
             Resource res = new Resource();
             res.setDirectory(targetYangDir.getPath());
             if (targetPath != null)
@@ -198,7 +199,7 @@ class YangToSourcesProcessor {
      * Instantiate generator from class and call required method
      */
     private void generateSourcesWithOneGenerator(ContextHolder context,
-            CodeGeneratorArg codeGeneratorCfg) throws ClassNotFoundException,
+                                                 CodeGeneratorArg codeGeneratorCfg) throws ClassNotFoundException,
             InstantiationException, IllegalAccessException, IOException {
 
         codeGeneratorCfg.check();