From: Martin Vitez Date: Thu, 23 May 2013 15:03:50 +0000 (+0200) Subject: CodeGenerator update. X-Git-Tag: releasepom-0.1.0~423^2 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=5f40ba7c5e58cda34092ff0262b1a5fe5a84a615 CodeGenerator update. Signed-off-by: Martin Vitez --- diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/controller/maven/sal/api/gen/plugin/CodeGeneratorImpl.java b/opendaylight/sal/yang-prototype/code-generator/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/controller/maven/sal/api/gen/plugin/CodeGeneratorImpl.java index 210b37fa15..d1b80b3f12 100644 --- a/opendaylight/sal/yang-prototype/code-generator/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/controller/maven/sal/api/gen/plugin/CodeGeneratorImpl.java +++ b/opendaylight/sal/yang-prototype/code-generator/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/controller/maven/sal/api/gen/plugin/CodeGeneratorImpl.java @@ -20,6 +20,7 @@ import org.opendaylight.controller.sal.binding.model.api.GeneratedTransferObject import org.opendaylight.controller.sal.binding.model.api.GeneratedType; import org.opendaylight.controller.sal.binding.model.api.Type; import org.opendaylight.controller.sal.java.api.generator.GeneratorJavaFile; +import org.opendaylight.controller.yang.model.api.Module; import org.opendaylight.controller.yang.model.api.SchemaContext; import org.opendaylight.controller.yang2sources.spi.CodeGenerator; @@ -27,7 +28,7 @@ public class CodeGeneratorImpl implements CodeGenerator { @Override public Collection generateSources(SchemaContext context, - File outputBaseDir, Set yangModulesNames) throws IOException { + File outputBaseDir, Set yangModules) throws IOException { final BindingGenerator bindingGenerator = new BindingGeneratorImpl(); final List types = bindingGenerator.generateTypes(context); 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 ab49a54fd1..f8117c077e 100644 --- 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 yangModules = parser .parseYangModelsFromStreams(yangFiles); - Set yangModulesNames = new HashSet(); - for (Module module : yangModules) { - yangModulesNames.add(module.getName()); - } - List yangFilesFromDependencies = getFilesFromDependenciesAsStream(); Set 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 names = Collections.emptySet(); - return new ContextHolder(null, names); + Set 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 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 yangModulesNames; + private final Set yangModules; private ContextHolder(SchemaContext context, - Set yangModulesNames) { + Set yangModules) { this.context = context; - this.yangModulesNames = yangModulesNames; + this.yangModules = yangModules; } public SchemaContext getContext() { return context; } - public Set getYangModulesNames() { - return yangModulesNames; + public Set getYangModules() { + return yangModules; } } diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin/src/test/java/org/opendaylight/controller/yang2sources/plugin/GenerateSourcesTest.java b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin/src/test/java/org/opendaylight/controller/yang2sources/plugin/GenerateSourcesTest.java index 170bc8df8b..2ded61426b 100644 --- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin/src/test/java/org/opendaylight/controller/yang2sources/plugin/GenerateSourcesTest.java +++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin/src/test/java/org/opendaylight/controller/yang2sources/plugin/GenerateSourcesTest.java @@ -21,6 +21,7 @@ import org.junit.Ignore; import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.opendaylight.controller.yang.model.api.Module; import org.opendaylight.controller.yang.model.api.SchemaContext; import org.opendaylight.controller.yang.model.parser.api.YangModelParser; import org.opendaylight.controller.yang2sources.plugin.ConfigArg.CodeGeneratorArg; @@ -80,7 +81,7 @@ public class GenerateSourcesTest { @Override public Collection generateSources(SchemaContext context, - File baseDir, Set yangModulesNames) { + File baseDir, Set yangModules) { called++; outputDir = baseDir; return Lists.newArrayList(); diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang/src/main/java/org/opendaylight/controller/yang2sources/spi/CodeGenerator.java b/opendaylight/sal/yang-prototype/code-generator/maven-yang/src/main/java/org/opendaylight/controller/yang2sources/spi/CodeGenerator.java index 161680ae53..14bcccccaf 100644 --- a/opendaylight/sal/yang-prototype/code-generator/maven-yang/src/main/java/org/opendaylight/controller/yang2sources/spi/CodeGenerator.java +++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang/src/main/java/org/opendaylight/controller/yang2sources/spi/CodeGenerator.java @@ -12,6 +12,7 @@ import java.io.IOException; import java.util.Collection; import java.util.Set; +import org.opendaylight.controller.yang.model.api.Module; import org.opendaylight.controller.yang.model.api.SchemaContext; /** @@ -28,11 +29,11 @@ public interface CodeGenerator { * @param outputBaseDir * expected output directory for generated sources configured by * user - * @param yangModulesNames - * name of yangs provided by current module + * @param yangModules + * yang modules parsed from yangFilesRootDir * @return collection of files that were generated from schema context * @throws IOException */ Collection generateSources(SchemaContext context, File outputBaseDir, - Set yangModulesNames) throws IOException; + Set yangModules) throws IOException; } diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang/src/test/java/org/opendaylight/controller/yang2sources/spi/CodeGeneratorTestImpl.java b/opendaylight/sal/yang-prototype/code-generator/maven-yang/src/test/java/org/opendaylight/controller/yang2sources/spi/CodeGeneratorTestImpl.java index 2918e4f5aa..60496277b8 100644 --- a/opendaylight/sal/yang-prototype/code-generator/maven-yang/src/test/java/org/opendaylight/controller/yang2sources/spi/CodeGeneratorTestImpl.java +++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang/src/test/java/org/opendaylight/controller/yang2sources/spi/CodeGeneratorTestImpl.java @@ -11,13 +11,14 @@ import java.io.File; import java.util.Collection; import java.util.Set; +import org.opendaylight.controller.yang.model.api.Module; import org.opendaylight.controller.yang.model.api.SchemaContext; public class CodeGeneratorTestImpl implements CodeGenerator { @Override public Collection generateSources(SchemaContext context, - File outputBaseDir, Set yangModulesNames) { + File outputBaseDir, Set yangModules) { // no-op return null; }