X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=model%2Fyang-model-util%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fmodel%2Futil%2FModuleNameNamespaceContext.java;fp=model%2Fyang-model-util%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fmodel%2Futil%2FModuleNameNamespaceContext.java;h=053fd411556dc0cdfdeb5d8daade37f09bf0af8e;hb=9aa25fd837ff21d7322fd950ea7a24e54f614ff2;hp=fee7619a543de86af906b476f2c7dc4205fcceb5;hpb=e4d7042ceaaf302725209f5bdb037be99a092790;p=yangtools.git

diff --git a/model/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/ModuleNameNamespaceContext.java b/model/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/ModuleNameNamespaceContext.java
index fee7619a54..053fd41155 100644
--- a/model/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/ModuleNameNamespaceContext.java
+++ b/model/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/ModuleNameNamespaceContext.java
@@ -14,7 +14,6 @@ import org.opendaylight.yangtools.yang.common.BiMapYangNamespaceContext;
 import org.opendaylight.yangtools.yang.common.QNameModule;
 import org.opendaylight.yangtools.yang.common.YangNamespaceContext;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
-import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.spi.AbstractEffectiveModelContextProvider;
 
 /**
@@ -53,13 +52,15 @@ public final class ModuleNameNamespaceContext extends AbstractEffectiveModelCont
 
     @Override
     public QNameModule namespaceForPrefix(final String prefix) {
-        return getEffectiveModelContext().findModules(prefix).stream().findFirst().map(Module::getQNameModule)
-            .orElse(null);
+        final var modules = getEffectiveModelContext().findModuleStatements(prefix).iterator();
+        return modules.hasNext() ? modules.next().localQNameModule() : null;
     }
 
     @Override
     public String prefixForNamespace(final QNameModule namespace) {
-        return getEffectiveModelContext().findModule(namespace).map(Module::getName).orElse(null);
+        return getEffectiveModelContext().findModuleStatement(namespace)
+            .map(module -> module.argument().getLocalName())
+            .orElse(null);
     }
 
     @java.io.Serial