From ec4a495e61bcbbeabd132ca2fdaeb6e4915f047c Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 1 Oct 2019 08:26:48 +0200 Subject: [PATCH] Adjust to CodeGenerator using EffectiveModelContext yangtools has changed the SPI interface in that it is giving us EffectiveModelContext instead of SchemaContext. Adjust to that. Change-Id: I2653fd3c0d17402841e774710f43f4d464dcdfe0 Signed-off-by: Robert Varga --- .../binding/maven/api/gen/plugin/CodeGeneratorImpl.java | 3 ++- .../doc/generator/maven/DocumentationGeneratorImpl.java | 4 ++-- .../binding/yang/wadl/generator/maven/WadlGenerator.java | 4 ++-- .../yang/unified/doc/generator/maven/DocGenTest.java | 4 ++-- .../doc/generator/maven/YangModuleInfoCompilationTest.java | 6 +++--- .../binding/yang/wadl/generator/maven/WadlGenTest.java | 6 +++--- 6 files changed, 14 insertions(+), 13 deletions(-) diff --git a/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/maven/api/gen/plugin/CodeGeneratorImpl.java b/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/maven/api/gen/plugin/CodeGeneratorImpl.java index 9108d318d2..2e4af3c5b3 100644 --- a/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/maven/api/gen/plugin/CodeGeneratorImpl.java +++ b/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/maven/api/gen/plugin/CodeGeneratorImpl.java @@ -38,6 +38,7 @@ import org.opendaylight.mdsal.binding.java.api.generator.YangModuleInfoTemplate; import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.mdsal.binding.spec.naming.BindingMapping; import org.opendaylight.yangtools.yang.binding.YangModelBindingProvider; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang2sources.spi.BasicCodeGenerator; @@ -60,7 +61,7 @@ public final class CodeGeneratorImpl implements BasicCodeGenerator, BuildContext private File resourceBaseDir; @Override - public Collection generateSources(final SchemaContext context, final File outputDir, + public Collection generateSources(final EffectiveModelContext context, final File outputDir, final Set yangModules, final Function> moduleResourcePathResolver) throws IOException { final File outputBaseDir; diff --git a/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/maven/DocumentationGeneratorImpl.java b/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/maven/DocumentationGeneratorImpl.java index 6737f3c8b9..a2b90efb9f 100644 --- a/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/maven/DocumentationGeneratorImpl.java +++ b/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/maven/DocumentationGeneratorImpl.java @@ -17,8 +17,8 @@ import java.util.Optional; import java.util.Set; import java.util.function.Function; import org.opendaylight.mdsal.binding.yang.unified.doc.generator.GeneratorImpl; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang2sources.spi.BasicCodeGenerator; import org.opendaylight.yangtools.yang2sources.spi.BuildContextAware; import org.sonatype.plexus.build.incremental.BuildContext; @@ -42,7 +42,7 @@ public class DocumentationGeneratorImpl extends GeneratorImpl implements BasicCo } @Override - public Collection generateSources(final SchemaContext context, final File outputBaseDir, + public Collection generateSources(final EffectiveModelContext context, final File outputBaseDir, final Set currentModules, final Function> moduleResourcePathResolver) throws IOException { return generate(buildContext, context, outputBaseDir, currentModules); diff --git a/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/yang/wadl/generator/maven/WadlGenerator.java b/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/yang/wadl/generator/maven/WadlGenerator.java index 45ec59df30..3b43e22e1a 100644 --- a/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/yang/wadl/generator/maven/WadlGenerator.java +++ b/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/yang/wadl/generator/maven/WadlGenerator.java @@ -18,8 +18,8 @@ import java.util.Optional; import java.util.Set; import java.util.function.Function; import org.opendaylight.mdsal.binding.yang.wadl.generator.WadlRestconfGenerator; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang2sources.spi.BasicCodeGenerator; import org.opendaylight.yangtools.yang2sources.spi.BuildContextAware; import org.sonatype.plexus.build.incremental.BuildContext; @@ -43,7 +43,7 @@ public class WadlGenerator implements BasicCodeGenerator, BuildContextAware { } @Override - public Collection generateSources(final SchemaContext context, final File outputBaseDir, + public Collection generateSources(final EffectiveModelContext context, final File outputBaseDir, final Set currentModules, final Function> moduleResourcePathResolver) throws IOException { final File outputDir; diff --git a/binding/maven-sal-api-gen-plugin/src/test/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/maven/DocGenTest.java b/binding/maven-sal-api-gen-plugin/src/test/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/maven/DocGenTest.java index 0eb46f7275..6d94bdea4d 100644 --- a/binding/maven-sal-api-gen-plugin/src/test/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/maven/DocGenTest.java +++ b/binding/maven-sal-api-gen-plugin/src/test/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/maven/DocGenTest.java @@ -22,8 +22,8 @@ import java.util.Set; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; import org.sonatype.plexus.build.incremental.DefaultBuildContext; @@ -50,7 +50,7 @@ public class DocGenTest { @Test public void testListGeneration() throws Exception { final List sourceFiles = getSourceFiles("/doc-gen"); - final SchemaContext context = YangParserTestUtils.parseYangFiles(sourceFiles); + final EffectiveModelContext context = YangParserTestUtils.parseYangFiles(sourceFiles); final Set modules = context.getModules(); final DocumentationGeneratorImpl generator = new DocumentationGeneratorImpl(); generator.setBuildContext(new DefaultBuildContext()); diff --git a/binding/maven-sal-api-gen-plugin/src/test/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/maven/YangModuleInfoCompilationTest.java b/binding/maven-sal-api-gen-plugin/src/test/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/maven/YangModuleInfoCompilationTest.java index 82eac6d041..b41db6f79e 100644 --- a/binding/maven-sal-api-gen-plugin/src/test/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/maven/YangModuleInfoCompilationTest.java +++ b/binding/maven-sal-api-gen-plugin/src/test/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/maven/YangModuleInfoCompilationTest.java @@ -37,7 +37,7 @@ import org.junit.Test; import org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl; import org.opendaylight.yangtools.yang.binding.YangModuleInfo; import org.opendaylight.yangtools.yang.common.YangConstants; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; import org.sonatype.plexus.build.incremental.DefaultBuildContext; @@ -144,7 +144,7 @@ public class YangModuleInfoCompilationTest { private static void generateTestSources(final String resourceDirPath, final File sourcesOutputDir) throws Exception { final List sourceFiles = getSourceFiles(resourceDirPath); - final SchemaContext context = YangParserTestUtils.parseYangFiles(sourceFiles); + final EffectiveModelContext context = YangParserTestUtils.parseYangFiles(sourceFiles); CodeGeneratorImpl codegen = new CodeGeneratorImpl(); codegen.setBuildContext(new DefaultBuildContext()); codegen.generateSources(context, sourcesOutputDir, context.getModules(), @@ -155,7 +155,7 @@ public class YangModuleInfoCompilationTest { @Test public void generateTestSourcesWithAdditionalConfig() throws Exception { final List sourceFiles = getSourceFiles("/yang-module-info"); - final SchemaContext context = YangParserTestUtils.parseYangFiles(sourceFiles); + final EffectiveModelContext context = YangParserTestUtils.parseYangFiles(sourceFiles); CodeGeneratorImpl codegen = new CodeGeneratorImpl(); codegen.setBuildContext(new DefaultBuildContext()); codegen.setResourceBaseDir(null); diff --git a/binding/maven-sal-api-gen-plugin/src/test/java/org/opendaylight/mdsal/binding/yang/wadl/generator/maven/WadlGenTest.java b/binding/maven-sal-api-gen-plugin/src/test/java/org/opendaylight/mdsal/binding/yang/wadl/generator/maven/WadlGenTest.java index 7aecd42ff6..d19d5e20c2 100644 --- a/binding/maven-sal-api-gen-plugin/src/test/java/org/opendaylight/mdsal/binding/yang/wadl/generator/maven/WadlGenTest.java +++ b/binding/maven-sal-api-gen-plugin/src/test/java/org/opendaylight/mdsal/binding/yang/wadl/generator/maven/WadlGenTest.java @@ -23,8 +23,8 @@ import java.util.Set; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; import org.sonatype.plexus.build.incremental.DefaultBuildContext; @@ -52,7 +52,7 @@ public class WadlGenTest { @Test public void testListGeneration() throws Exception { final List sourceFiles = getSourceFiles("/wadl-gen"); - final SchemaContext context = YangParserTestUtils.parseYangFiles(sourceFiles); + final EffectiveModelContext context = YangParserTestUtils.parseYangFiles(sourceFiles); final Set modules = context.getModules(); final WadlGenerator generator = new WadlGenerator(); generator.setBuildContext(new DefaultBuildContext()); @@ -65,7 +65,7 @@ public class WadlGenTest { @Test public void testListGenerationWithoutPath() throws Exception { final List sourceFiles = getSourceFiles("/wadl-gen"); - final SchemaContext context = YangParserTestUtils.parseYangFiles(sourceFiles); + final EffectiveModelContext context = YangParserTestUtils.parseYangFiles(sourceFiles); final Set modules = context.getModules(); final WadlGenerator generator = new WadlGenerator(); generator.setBuildContext(new DefaultBuildContext()); -- 2.36.6