Adjust for ModuleEffectiveStatement argument

The argument has changed, extract the local name.

Change-Id: I7a6f3cad95b32e3f60c1719b36a95c5f91847557
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BaseTemplate.xtend b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BaseTemplate.xtend
index d73e9317758d82fd755d4cd3356d8c16f1168671..5528a657337a5b27ab2adddef46354db31e22e83 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BaseTemplate.xtend
+++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BaseTemplate.xtend
@@ -282,7 +282,7 @@ abstract class BaseTemplate extends JavaFileTemplate {
                 if (node instanceof SchemaNode) {
                     sb.append("The schema path to identify an instance is\n")
                     .append("<i>")
-                    .append(formatSchemaPath(def.module.argument, node.path.pathFromRoot))
+                    .append(formatSchemaPath(def.module.argument.localName, node.path.pathFromRoot))
                     .append("</i>\n")
 
                     if (hasBuilderClass(node)) {

diff --git a/binding/mdsal-binding-runtime-spi/src/main/java/org/opendaylight/mdsal/binding/runtime/spi/ModuleInfoSnapshotResolver.java b/binding/mdsal-binding-runtime-spi/src/main/java/org/opendaylight/mdsal/binding/runtime/spi/ModuleInfoSnapshotResolver.java
index 7982e8a4121e45bc9750029ea436fff7e640efe0..afecd8caec637182d97538d76a57c4dd4cf9f628 100644 (file)
--- a/binding/mdsal-binding-runtime-spi/src/main/java/org/opendaylight/mdsal/binding/runtime/spi/ModuleInfoSnapshotResolver.java
+++ b/binding/mdsal-binding-runtime-spi/src/main/java/org/opendaylight/mdsal/binding/runtime/spi/ModuleInfoSnapshotResolver.java
@@ -177,9 +177,9 @@ public final class ModuleInfoSnapshotResolver implements Mutable {
             final Optional<Revision> revision = entry.getKey().getRevision();
             final ModuleEffectiveStatement module = entry.getValue();
 
-            sources.add(RevisionSourceIdentifier.create(module.argument(), revision));
+            sources.add(RevisionSourceIdentifier.create(module.argument().getLocalName(), revision));
             module.streamEffectiveSubstatements(SubmoduleEffectiveStatement.class)
-                .map(submodule -> RevisionSourceIdentifier.create(submodule.argument(), revision))
+                .map(submodule -> RevisionSourceIdentifier.create(submodule.argument().getLocalName(), revision))
                 .forEach(sources::add);
         }