BUG-4688: Make SourceIdentifier use Revision

[yangtools.git] / yang / yang-parser-impl / src / main / java / org / opendaylight / yangtools / yang / parser / stmt / rfc6020 / ImportStatementDefinition.java

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ImportStatementDefinition.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ImportStatementDefinition.java
index 537c9ec248e286eb847e7a106b7740ff6a5f4ad0..1a1fd8f18403d60c1ec7be729dac471350524cce 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ImportStatementDefinition.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ImportStatementDefinition.java
@@ -189,7 +189,7 @@ public class ImportStatementDefinition extends
             final StmtContext<Revision, ?, ?> revision = findFirstDeclaredSubstatement(stmt,
                 RevisionDateStatement.class);
             return revision == null ? RevisionSourceIdentifier.create(stmt.getStatementArgument())
-                    : RevisionSourceIdentifier.create(stmt.getStatementArgument(), revision.rawStatementArgument());
+                    : RevisionSourceIdentifier.create(stmt.getStatementArgument(), revision.getStatementArgument());
         }
     }
 
@@ -327,9 +327,8 @@ public class ImportStatementDefinition extends
 
         private static SemVerSourceIdentifier createSemVerModuleIdentifier(
                 final ModuleIdentifier importedModuleIdentifier, final SemVer semVer) {
-            final String formattedRevision = importedModuleIdentifier.getRevision().map(Revision::toString)
-                    .orElse(null);
-            return SemVerSourceIdentifier.create(importedModuleIdentifier.getName(), formattedRevision, semVer);
+            return SemVerSourceIdentifier.create(importedModuleIdentifier.getName(),
+                importedModuleIdentifier.getRevision(), semVer);
         }
     }
 }