BUG-4688: switch revisions from Date to Revision

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

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ImportEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ImportEffectiveStatementImpl.java
index 00d71e83f45270e0730e865d2a85fda1c87b18ed..4e95d34dafb950bb41356e030c63e6e312552436 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ImportEffectiveStatementImpl.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ImportEffectiveStatementImpl.java
@@ -8,12 +8,11 @@
 package org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective;
 
 import com.google.common.base.MoreObjects;
-import java.util.Date;
 import java.util.Objects;
 import java.util.Optional;
 import org.opendaylight.yangtools.concepts.SemVer;
-import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.QNameModule;
+import org.opendaylight.yangtools.yang.common.Revision;
 import org.opendaylight.yangtools.yang.model.api.ModuleImport;
 import org.opendaylight.yangtools.yang.model.api.stmt.ImportStatement;
 import org.opendaylight.yangtools.yang.model.repo.api.SemVerSourceIdentifier;
@@ -27,7 +26,7 @@ public class ImportEffectiveStatementImpl extends DeclaredEffectiveStatementBase
         implements ModuleImport {
 
     private final String moduleName;
-    private final Date revision;
+    private final Revision revision;
     private final SemVer semVer;
     private final String prefix;
     private final String description;
@@ -53,7 +52,7 @@ public class ImportEffectiveStatementImpl extends DeclaredEffectiveStatementBase
         } else {
             final SemVerSourceIdentifier importedModuleIdentifier = ctx.getFromNamespace(
                 ImportPrefixToSemVerSourceIdentifier.class, prefix);
-            revision = QName.parseRevision(importedModuleIdentifier.getRevision());
+            revision = Revision.valueOf(importedModuleIdentifier.getRevision());
             semVer = importedModuleIdentifier.getSemanticVersion().orElse(null);
         }
 
@@ -65,7 +64,7 @@ public class ImportEffectiveStatementImpl extends DeclaredEffectiveStatementBase
         this.reference = referenceStmt != null ? referenceStmt.argument() : null;
     }
 
-    private Date getImportedRevision(final StmtContext<String, ImportStatement, ?> ctx) {
+    private Revision getImportedRevision(final StmtContext<String, ImportStatement, ?> ctx) {
         /*
          * When 'revision-date' of an import is not specified in yang source, we
          * need to find revision of imported module.
@@ -82,7 +81,7 @@ public class ImportEffectiveStatementImpl extends DeclaredEffectiveStatementBase
     }
 
     @Override
-    public Optional<Date> getRevision() {
+    public Optional<Revision> getRevision() {
         return Optional.ofNullable(revision);
     }