BUG-4688: Rework SchemaContext module lookups

[yangtools.git] / yang / yang-data-impl / src / main / java / org / opendaylight / yangtools / yang / data / impl / leafref / LeafRefPathParserListenerImpl.java

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefPathParserListenerImpl.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefPathParserListenerImpl.java
index fb33abbc2c2257828f8d83762d0e4259072b714f..9ce694e7c3227b6a00bc469730f3d9672922287e 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefPathParserListenerImpl.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefPathParserListenerImpl.java
@@ -165,10 +165,7 @@ final class LeafRefPathParserListenerImpl extends LeafRefPathParserBaseListener
 
     private URI getNamespaceForImportPrefix(final String prefix) {
         final ModuleImport moduleImport = getModuleImport(prefix);
-        final Module findedModule = schemaContext.findModuleByName(moduleImport.getModuleName(),
-            moduleImport.getRevision());
-
-        return findedModule.getNamespace();
+        return schemaContext.findModule(moduleImport.getModuleName(), moduleImport.getRevision()).get().getNamespace();
     }
 
     private Optional<QNameModule> getQNameModuleForImportPrefix(final String prefix) {
@@ -179,9 +176,7 @@ final class LeafRefPathParserListenerImpl extends LeafRefPathParserBaseListener
 
         final String moduleName = moduleImport.getModuleName();
         final Date revision = moduleImport.getRevision();
-        final Module foundModule = schemaContext.findModuleByName(moduleName, revision);
-
-        return Optional.of(foundModule.getQNameModule());
+        return schemaContext.findModule(moduleName, revision).map(Module::getQNameModule);
     }
 
     private ModuleImport getModuleImport(final String prefix) {