From 3d02604b254519dd237a6c8a4eedb48f22b264db Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 6 Oct 2020 13:41:48 +0200 Subject: [PATCH] Adjust for ModuleEffectiveStatement argument The argument has changed, extract the local name. Change-Id: I7a6f3cad95b32e3f60c1719b36a95c5f91847557 Signed-off-by: Robert Varga --- .../mdsal/binding/java/api/generator/BaseTemplate.xtend | 2 +- .../mdsal/binding/runtime/spi/ModuleInfoSnapshotResolver.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 d73e931775..5528a65733 100644 --- 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("") - .append(formatSchemaPath(def.module.argument, node.path.pathFromRoot)) + .append(formatSchemaPath(def.module.argument.localName, node.path.pathFromRoot)) .append("\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 7982e8a412..afecd8caec 100644 --- 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 = 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); } -- 2.36.6