BUG-4688: Make SourceIdentifier use Revision

[yangtools.git] / yang / yang-parser-spi / src / main / java / org / opendaylight / yangtools / yang / parser / spi / meta / StmtContextUtils.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContextUtils.java b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContextUtils.java
index cd91b51cc29bff6cd87f44b3df9f78b2b4bdbcaa..5f88a708ddfc778e7a4df2d1fa09090527bc0fc4 100644 (file)
--- a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContextUtils.java
+++ b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContextUtils.java
@@ -544,19 +544,12 @@ public final class StmtContextUtils {
         final QNameModule qNameModule = root.getFromNamespace(ModuleCtxToModuleQName.class, root);
         if (qNameModule != null) {
             // creates SourceIdentifier for a module
-            if (qNameModule.getFormattedRevision() == null) {
-                return RevisionSourceIdentifier.create((String) root.getStatementArgument());
-            }
-
-            return RevisionSourceIdentifier.create((String) root.getStatementArgument(),
-                qNameModule.getFormattedRevision());
+            return RevisionSourceIdentifier.create((String) root.getStatementArgument(), qNameModule.getRevision());
         }
 
         // creates SourceIdentifier for a submodule
         final Optional<Revision> revision = getLatestRevision(root.declaredSubstatements());
-        return revision.isPresent()
-                ? RevisionSourceIdentifier.create((String) root.getStatementArgument(), revision.get().toString())
-                        : RevisionSourceIdentifier.create((String) root.getStatementArgument());
+        return RevisionSourceIdentifier.create((String) root.getStatementArgument(), revision);
     }
 
     public static Optional<Revision> getLatestRevision(final Iterable<? extends StmtContext<?, ?, ?>> subStmts) {