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>

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 8ecc6f230a75b337456239cd356753a0137627b4..9694bc4671e15e65e8b862d08154df8559cc976c 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
@@ -78,7 +78,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 a72079fe56b712eb04658552a9eb5a9841524651..4cb29984ed8f82532eac19ef3da89d642a9d938b 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
@@ -107,7 +107,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 cf70f75066e467b8dbf2acc54169a4e4d5691114..43faea0b25c232b6ab97a2069afb88697a033852 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.junit.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);