Properly propagate BuildContext

YangToSourcesProcessor was not properly propagating BuildContext,
fix that.

JIRA: YANGTOOLS-915
Change-Id: Id4f28fe640bbd4d4ed065b9aa62f0becb2db43ec
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 4bdd0b2f66433d7586a1eb32636bdab8a1d4361c)

diff --git a/yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesMojo.java b/yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesMojo.java
index 7ad534a6de0f245052e568d1b44546bc54079e82..0cba5fe0ed5d3143ccdf0b6c2fff851a0214616f 100644 (file)
--- a/yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesMojo.java
+++ b/yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesMojo.java
@@ -77,7 +77,8 @@ public final class YangToSourcesMojo extends AbstractMojo {
     private boolean inspectDependencies;
 
     @Component
-    private BuildContext buildContext;
+    @VisibleForTesting
+    BuildContext buildContext;
 
     private YangToSourcesProcessor yangToSourcesProcessor;
 

diff --git a/yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessor.java b/yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessor.java
index 3501c7b65727fb043529a3e612376c651a92512c..49debbd9be273bffd9315ef40513b9ac88559dd4 100644 (file)
--- a/yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessor.java
+++ b/yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessor.java
@@ -105,7 +105,8 @@ class YangToSourcesProcessor {
     YangToSourcesProcessor(final BuildContext buildContext, final File yangFilesRootDir,
                 final Collection<File> excludedFiles, final List<CodeGeneratorArg> codeGenerators,
                 final MavenProject project, final boolean inspectDependencies) {
-        this(yangFilesRootDir, excludedFiles, codeGenerators, project, inspectDependencies, YangProvider.getInstance());
+        this(buildContext, yangFilesRootDir, excludedFiles, codeGenerators, project, inspectDependencies,
+            YangProvider.getInstance());
     }
 
     public void execute() throws MojoExecutionException, MojoFailureException {

diff --git a/yang/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesMojoTest.java b/yang/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesMojoTest.java
index 041b24198bda0a818bd949e1229504d935434b95..702d7307c8d6b3b56feae7b422bc60cf061285d5 100644 (file)
--- a/yang/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesMojoTest.java
+++ b/yang/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesMojoTest.java
@@ -22,6 +22,7 @@ import org.mockito.Mockito;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.opendaylight.yangtools.yang2sources.plugin.ConfigArg.CodeGeneratorArg;
 import org.opendaylight.yangtools.yang2sources.plugin.GenerateSourcesTest.GeneratorMock;
+import org.sonatype.plexus.build.incremental.DefaultBuildContext;
 
 @RunWith(MockitoJUnitRunner.class)
 public class YangToSourcesMojoTest {
@@ -42,6 +43,7 @@ public class YangToSourcesMojoTest {
 
         this.mojo = new YangToSourcesMojo();
         this.mojo.setProject(this.project);
+        this.mojo.buildContext = new DefaultBuildContext();
         this.mojo.execute();
         Assert.assertNotNull(this.mojo);