X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-parser-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fparser%2Fimpl%2Futil%2FYangModelDependencyInfo.java;h=6b1abbc91158fe1089f5681c6c2a00e166a4196d;hb=b212baa59f859732bd3a799425bb420035fe6154;hp=bbe69e0410b701c924ef3972b81ca1400fb9df64;hpb=37cba1113648133b6efecfa7396ef906b6d0e758;p=yangtools.git

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/util/YangModelDependencyInfo.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/util/YangModelDependencyInfo.java
index bbe69e0410..6b1abbc911 100644
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/util/YangModelDependencyInfo.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/util/YangModelDependencyInfo.java
@@ -1,40 +1,43 @@
 /*
- * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved.
+ * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
+ *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/eplv10.html
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 package org.opendaylight.yangtools.yang.parser.impl.util;
 
-import static org.opendaylight.yangtools.yang.parser.impl.ParserListenerUtils.getArgumentString;
-import static org.opendaylight.yangtools.yang.parser.impl.ParserListenerUtils.getFirstContext;
+import static com.google.common.base.Preconditions.checkArgument;
+import static java.util.Objects.requireNonNull;
 
-import com.google.common.base.Optional;
+import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableSet;
-import java.io.InputStream;
-import java.util.Date;
-import java.util.List;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import javax.annotation.Nullable;
 import org.antlr.v4.runtime.ParserRuleContext;
-import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Belongs_to_stmtContext;
-import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Import_stmtContext;
-import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Include_stmtContext;
-import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Module_stmtContext;
-import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Revision_date_stmtContext;
-import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Revision_stmtContext;
-import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Revision_stmtsContext;
-import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Submodule_stmtContext;
-import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.YangContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangStatementParser.StatementContext;
+import org.opendaylight.yangtools.concepts.SemVer;
 import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.Revision;
 import org.opendaylight.yangtools.yang.model.api.ModuleImport;
+import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.parser.api.YangSyntaxErrorException;
-import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl;
+import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource;
+import org.opendaylight.yangtools.yang.parser.rfc6020.repo.YangStatementStreamSource;
+import org.opendaylight.yangtools.yang.parser.spi.source.DeclarationInTextSource;
+import org.opendaylight.yangtools.yang.parser.spi.source.StatementSourceReference;
+import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.SupportedExtensionsMapping;
+import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.Utils;
 
 /**
  * Helper transfer object which holds basic and dependency information for YANG
  * model.
  *
- *
- *
+ * <p>
  * There are two concrete implementations of this interface:
  * <ul>
  * <li>{@link ModuleDependencyInfo} - Dependency information for module</li>
@@ -43,35 +46,49 @@ import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl;
  *
  * @see ModuleDependencyInfo
  * @see SubmoduleDependencyInfo
- *
  */
-
 public abstract class YangModelDependencyInfo {
+    private static final String BELONGS_TO = YangStmtMapping.BELONGS_TO.getStatementName().getLocalName();
+    private static final String IMPORT = YangStmtMapping.IMPORT.getStatementName().getLocalName();
+    private static final String INCLUDE = YangStmtMapping.INCLUDE.getStatementName().getLocalName();
+    private static final String MODULE = YangStmtMapping.MODULE.getStatementName().getLocalName();
+    private static final String REVISION = YangStmtMapping.REVISION.getStatementName().getLocalName();
+    private static final String REVISION_DATE = YangStmtMapping.REVISION_DATE.getStatementName().getLocalName();
+    private static final String SUBMODULE = YangStmtMapping.SUBMODULE.getStatementName().getLocalName();
+
+    private static final String OPENCONFIG_VERSION = SupportedExtensionsMapping.OPENCONFIG_VERSION.getStatementName()
+            .getLocalName();
 
     private final String name;
     private final String formattedRevision;
-    private final Date revision;
+    private final Revision revision;
+    private final Optional<SemVer> semVer;
     private final ImmutableSet<ModuleImport> submoduleIncludes;
     private final ImmutableSet<ModuleImport> moduleImports;
     private final ImmutableSet<ModuleImport> dependencies;
 
     YangModelDependencyInfo(final String name, final String formattedRevision,
-            final ImmutableSet<ModuleImport> imports, final ImmutableSet<ModuleImport> includes) {
+            final ImmutableSet<ModuleImport> imports,
+            final ImmutableSet<ModuleImport> includes) {
+        this(name, formattedRevision, imports, includes, Optional.empty());
+    }
+
+    YangModelDependencyInfo(final String name, final String formattedRevision,
+            final ImmutableSet<ModuleImport> imports,
+            final ImmutableSet<ModuleImport> includes,
+            final Optional<SemVer> semVer) {
         this.name = name;
         this.formattedRevision = formattedRevision;
-        this.revision = formattedRevision == null ? null : QName.parseRevision(formattedRevision);
+        this.revision = formattedRevision == null ? null : Revision.valueOf(formattedRevision);
         this.moduleImports = imports;
         this.submoduleIncludes = includes;
-        this.dependencies = ImmutableSet.<ModuleImport> builder() //
-                .addAll(moduleImports) //
-                .addAll(submoduleIncludes) //
-                .build();
+        this.dependencies = ImmutableSet.<ModuleImport>builder()
+                .addAll(moduleImports).addAll(submoduleIncludes).build();
+        this.semVer = semVer;
     }
 
     /**
-     * Returns immutable collection of all module imports.
-     *
-     * This collection contains both <code>import</code> statements
+     * Returns immutable collection of all module imports. This collection contains both <code>import</code> statements
      * and <code>include</code> statements for submodules.
      *
      * @return Immutable collection of imports.
@@ -81,7 +98,7 @@ public abstract class YangModelDependencyInfo {
     }
 
     /**
-     * Returns model name
+     * Returns model name.
      *
      * @return model name
      */
@@ -90,7 +107,7 @@ public abstract class YangModelDependencyInfo {
     }
 
     /**
-     * Returns formatted revision string
+     * Returns formatted revision string.
      *
      * @return formatted revision string
      */
@@ -99,20 +116,30 @@ public abstract class YangModelDependencyInfo {
     }
 
     /**
-     * Returns revision
+     * Returns revision.
      *
      * @return revision
      */
-    Date getRevision() {
+    Revision getRevision() {
         return revision;
     }
 
+    /**
+     * Returns semantic version of module.
+     *
+     * @return semantic version
+     */
+    public Optional<SemVer> getSemanticVersion() {
+        return semVer;
+    }
+
     @Override
     public int hashCode() {
         final int prime = 31;
         int result = 1;
-        result = prime * result + ((formattedRevision == null) ? 0 : formattedRevision.hashCode());
-        result = prime * result + ((name == null) ? 0 : name.hashCode());
+        result = prime * result + Objects.hashCode(formattedRevision);
+        result = prime * result + Objects.hashCode(name);
+        result = prime * result + Objects.hashCode(semVer);
         return result;
     }
 
@@ -127,7 +154,7 @@ public abstract class YangModelDependencyInfo {
         if (!(obj instanceof YangModelDependencyInfo)) {
             return false;
         }
-        YangModelDependencyInfo other = (YangModelDependencyInfo) obj;
+        final YangModelDependencyInfo other = (YangModelDependencyInfo) obj;
         if (formattedRevision == null) {
             if (other.formattedRevision != null) {
                 return false;
@@ -142,193 +169,249 @@ public abstract class YangModelDependencyInfo {
         } else if (!name.equals(other.name)) {
             return false;
         }
-        return true;
+        return Objects.equals(semVer, other.semVer);
     }
 
     /**
-     * Extracts {@link YangModelDependencyInfo} from an abstract syntax tree
-     * of a YANG model.
+     * Extracts {@link YangModelDependencyInfo} from an abstract syntax tree of a YANG model.
      *
      * @param tree Abstract syntax tree
      * @return {@link YangModelDependencyInfo}
-     * @throws YangSyntaxErrorException
-     *             If the AST is not a valid YANG module/submodule
+     * @throws YangSyntaxErrorException If the AST is not a valid YANG module/submodule
      */
-    public static YangModelDependencyInfo fromAST(final String name, final ParserRuleContext tree) throws YangSyntaxErrorException {
-        final Optional<Module_stmtContext> moduleCtx = getFirstContext(tree, Module_stmtContext.class);
-        if (moduleCtx.isPresent()) {
-            return parseModuleContext(moduleCtx.get());
-        }
+    public static YangModelDependencyInfo fromAST(final String name,
+            final ParserRuleContext tree) throws YangSyntaxErrorException {
 
-        final Optional<Submodule_stmtContext> submoduleCtx = getFirstContext(tree, Submodule_stmtContext.class);
-        if (submoduleCtx.isPresent()) {
-            return parseSubmoduleContext(submoduleCtx.get());
+        if (tree instanceof StatementContext) {
+            final StatementContext rootStatement = (StatementContext) tree;
+            return parseAST(rootStatement, name);
         }
 
         throw new YangSyntaxErrorException(name, 0, 0, "Unknown YANG text type");
     }
 
+    private static YangModelDependencyInfo parseAST(final StatementContext rootStatement, final String sourceName) {
+        final String keyWordText = rootStatement.keyword().getText();
+        if (MODULE.equals(keyWordText)) {
+            return parseModuleContext(rootStatement, sourceName);
+        }
+        if (SUBMODULE.equals(keyWordText)) {
+            return parseSubmoduleContext(rootStatement, sourceName);
+        }
+        throw new IllegalArgumentException("Root of parsed AST must be either module or submodule");
+    }
+
     /**
-     * Extracts {@link YangModelDependencyInfo} from input stream
-     * containing YANG model.
-     *
-     * This parsing does not validate full YANG module, only
-     * parses header up to the revisions and imports.
+     * Extracts {@link YangModelDependencyInfo} from input stream containing a YANG model. This parsing does not
+     * validate full YANG module, only parses header up to the revisions and imports.
      *
-     * @param yangStream
-     *            Opened Input stream containing text source of YANG model
+     * @param refClass Base search class
+     * @param resourceName resource name, relative to refClass
      * @return {@link YangModelDependencyInfo}
+     * @throws YangSyntaxErrorException If the resource does not pass syntactic analysis
+     * @throws IOException When the resource cannot be read
      * @throws IllegalArgumentException
      *             If input stream is not valid YANG stream
      */
-    public static YangModelDependencyInfo fromInputStream(final InputStream yangStream) {
-        YangContext yangContext = YangParserImpl.parseStreamWithoutErrorListeners(yangStream);
+    public static YangModelDependencyInfo forResource(final Class<?> refClass, final String resourceName)
+            throws IOException, YangSyntaxErrorException {
+        final YangStatementStreamSource source = YangStatementStreamSource.create(
+            YangTextSchemaSource.forResource(refClass, resourceName));
+        final ParserRuleContext ast = source.getYangAST();
+        checkArgument(ast instanceof StatementContext);
+        return parseAST((StatementContext) ast, source.getIdentifier().toYangFilename());
+    }
 
-        Optional<Module_stmtContext> moduleCtx = getFirstContext(yangContext, Module_stmtContext.class);
-        if (moduleCtx.isPresent()) {
-            return parseModuleContext(moduleCtx.get());
-        }
-        Optional<Submodule_stmtContext> submoduleCtx = getFirstContext(yangContext, Submodule_stmtContext.class);
-        if (submoduleCtx.isPresent()) {
-            return parseSubmoduleContext(submoduleCtx.get());
+    private static YangModelDependencyInfo parseModuleContext(final StatementContext module, final String sourceName) {
+        final String name = Utils.stringFromStringContext(module.argument(), getReference(sourceName, module));
+        final String latestRevision = getLatestRevision(module, sourceName);
+        final Optional<SemVer> semVer = Optional.ofNullable(findSemanticVersion(module, sourceName));
+        final ImmutableSet<ModuleImport> imports = parseImports(module, sourceName);
+        final ImmutableSet<ModuleImport> includes = parseIncludes(module, sourceName);
+
+        return new ModuleDependencyInfo(name, latestRevision, imports, includes, semVer);
+    }
+
+    private static ImmutableSet<ModuleImport> parseImports(final StatementContext module, final String sourceName) {
+        final Set<ModuleImport> result = new HashSet<>();
+        for (final StatementContext subStatementContext : module.statement()) {
+            if (IMPORT.equals(subStatementContext.keyword().getText())) {
+                final String revisionDateStr = getRevisionDateString(subStatementContext, sourceName);
+                final String importedModuleName = Utils.stringFromStringContext(subStatementContext.argument(),
+                        getReference(sourceName, subStatementContext));
+                final Revision revisionDate = revisionDateStr == null ? null : Revision.valueOf(revisionDateStr);
+                final SemVer importSemVer = findSemanticVersion(subStatementContext, sourceName);
+                result.add(new ModuleImportImpl(importedModuleName, revisionDate, importSemVer));
+            }
         }
-        throw new IllegalArgumentException("Supplied stream is not valid yang file.");
+        return ImmutableSet.copyOf(result);
     }
 
-    private static YangModelDependencyInfo parseModuleContext(final Module_stmtContext module) {
-        String name = getArgumentString(module);
-        String latestRevision = getLatestRevision(module.revision_stmts());
-        ImmutableSet<ModuleImport> imports = parseImports(module.linkage_stmts().import_stmt());
-        ImmutableSet<ModuleImport> includes = parseIncludes(module.linkage_stmts().include_stmt());
+    private static SemVer findSemanticVersion(final StatementContext statement, final String sourceName) {
+        String semVerString = null;
+        for (final StatementContext subStatement : statement.statement()) {
+            final String subStatementName = Utils.trimPrefix(subStatement.keyword().getText());
+            if (OPENCONFIG_VERSION.equals(subStatementName)) {
+                semVerString = Utils.stringFromStringContext(subStatement.argument(),
+                        getReference(sourceName, subStatement));
+                break;
+            }
+        }
+
+        return Strings.isNullOrEmpty(semVerString) ? null : SemVer.valueOf(semVerString);
+    }
 
-        return new ModuleDependencyInfo(name, latestRevision, imports, includes);
+    private static ImmutableSet<ModuleImport> parseIncludes(final StatementContext module, final String sourceName) {
+        final Set<ModuleImport> result = new HashSet<>();
+        for (final StatementContext subStatementContext : module.statement()) {
+            if (INCLUDE.equals(subStatementContext.keyword().getText())) {
+                final String revisionDateStr = getRevisionDateString(subStatementContext, sourceName);
+                final String IncludeModuleName = Utils.stringFromStringContext(subStatementContext.argument(),
+                        getReference(sourceName, subStatementContext));
+                final Revision revisionDate = revisionDateStr == null ? null : Revision.valueOf(revisionDateStr);
+                result.add(new ModuleImportImpl(IncludeModuleName, revisionDate));
+            }
+        }
+        return ImmutableSet.copyOf(result);
     }
 
-    private static ImmutableSet<ModuleImport> parseImports(final List<Import_stmtContext> importStatements) {
-        ImmutableSet.Builder<ModuleImport> builder = ImmutableSet.builder();
-        for (Import_stmtContext importStmt : importStatements) {
-            String moduleName = getArgumentString(importStmt);
-            Date revision = getRevision(importStmt.revision_date_stmt());
-            builder.add(new ModuleImportImpl(moduleName, revision));
+    private static String getRevisionDateString(final StatementContext importStatement, final String sourceName) {
+        String revisionDateStr = null;
+        for (final StatementContext importSubStatement : importStatement.statement()) {
+            if (REVISION_DATE.equals(importSubStatement.keyword().getText())) {
+                revisionDateStr = Utils.stringFromStringContext(importSubStatement.argument(),
+                        getReference(sourceName, importSubStatement));
+            }
         }
-        return builder.build();
+        return revisionDateStr;
     }
 
-    public static String getLatestRevision(final Revision_stmtsContext revision_stmts) {
-        List<Revision_stmtContext> revisions = revision_stmts.getRuleContexts(Revision_stmtContext.class);
+    public static String getLatestRevision(final StatementContext module, final String sourceName) {
         String latestRevision = null;
-        for (Revision_stmtContext revisionStmt : revisions) {
-            String currentRevision = getArgumentString(revisionStmt);
-            if (latestRevision == null || latestRevision.compareTo(currentRevision) == -1) {
-                latestRevision = currentRevision;
+        for (final StatementContext subStatementContext : module.statement()) {
+            if (REVISION.equals(subStatementContext.keyword().getText())) {
+                final String currentRevision = Utils.stringFromStringContext(subStatementContext.argument(),
+                        getReference(sourceName, subStatementContext));
+                if (latestRevision == null || latestRevision.compareTo(currentRevision) == -1) {
+                    latestRevision = currentRevision;
+                }
             }
         }
         return latestRevision;
     }
 
-    private static YangModelDependencyInfo parseSubmoduleContext(final Submodule_stmtContext submodule) {
-        String name = getArgumentString(submodule);
-        Belongs_to_stmtContext belongsToStmt = submodule.submodule_header_stmts().belongs_to_stmt(0);
-        String belongsTo = getArgumentString(belongsToStmt);
+    private static YangModelDependencyInfo parseSubmoduleContext(final StatementContext submodule,
+            final String sourceName) {
+        final String name = Utils.stringFromStringContext(submodule.argument(), getReference(sourceName, submodule));
+        final String belongsTo = parseBelongsTo(submodule, sourceName);
 
-        String latestRevision = getLatestRevision(submodule.revision_stmts());
-        ImmutableSet<ModuleImport> imports = parseImports(submodule.linkage_stmts().import_stmt());
-        ImmutableSet<ModuleImport> includes = parseIncludes(submodule.linkage_stmts().include_stmt());
+        final String latestRevision = getLatestRevision(submodule, sourceName);
+        final ImmutableSet<ModuleImport> imports = parseImports(submodule, sourceName);
+        final ImmutableSet<ModuleImport> includes = parseIncludes(submodule, sourceName);
 
         return new SubmoduleDependencyInfo(name, latestRevision, belongsTo, imports, includes);
     }
 
-    private static ImmutableSet<ModuleImport> parseIncludes(final List<Include_stmtContext> importStatements) {
-        ImmutableSet.Builder<ModuleImport> builder = ImmutableSet.builder();
-        for (Include_stmtContext importStmt : importStatements) {
-            String moduleName = getArgumentString(importStmt);
-            Date revision = getRevision(importStmt.revision_date_stmt());
-            builder.add(new ModuleImportImpl(moduleName, revision));
+    private static String parseBelongsTo(final StatementContext submodule, final String sourceName) {
+        for (final StatementContext subStatementContext : submodule.statement()) {
+            if (BELONGS_TO.equals(subStatementContext.keyword().getText())) {
+                return Utils.stringFromStringContext(subStatementContext.argument(),
+                    getReference(sourceName, subStatementContext));
+            }
         }
-        return builder.build();
+        return null;
     }
 
-    private static Date getRevision(final Revision_date_stmtContext revision_date_stmt) {
-        if (revision_date_stmt == null) {
-            return null;
-        }
-        String formatedDate = getArgumentString(revision_date_stmt);
-        return QName.parseRevision(formatedDate);
+    private static StatementSourceReference getReference(final String sourceName,
+            final StatementContext context) {
+        return DeclarationInTextSource.atPosition(sourceName, context.getStart().getLine(),
+            context.getStart().getCharPositionInLine());
     }
 
     /**
-     *
      * Dependency information for YANG module.
-     *
      */
-    public static final class ModuleDependencyInfo extends YangModelDependencyInfo {
-
+    public static class ModuleDependencyInfo extends YangModelDependencyInfo {
         private ModuleDependencyInfo(final String name, final String latestRevision,
                 final ImmutableSet<ModuleImport> imports, final ImmutableSet<ModuleImport> includes) {
             super(name, latestRevision, imports, includes);
         }
 
+        private ModuleDependencyInfo(final String name, final String latestRevision,
+                final ImmutableSet<ModuleImport> imports,
+                final ImmutableSet<ModuleImport> includes,
+                final Optional<SemVer> semVer) {
+            super(name, latestRevision, imports, includes, semVer);
+        }
+
         @Override
         public String toString() {
-            return "Module [name=" + getName() + ", revision=" + getRevision() + ", dependencies=" + getDependencies()
-                    + "]";
+            return "Module [name=" + getName() + ", revision=" + getRevision()
+            + ", semanticVersion=" + getSemanticVersion().orElse(null)
+            + ", dependencies=" + getDependencies()
+            + "]";
         }
     }
 
     /**
-     *
-     * Dependency information for submodule, also provides name
-     * for parent module.
-     *
+     * Dependency information for submodule, also provides name for parent module.
      */
     public static final class SubmoduleDependencyInfo extends YangModelDependencyInfo {
-
         private final String belongsTo;
 
+        private SubmoduleDependencyInfo(final String name, final String latestRevision, final String belongsTo,
+                final ImmutableSet<ModuleImport> imports, final ImmutableSet<ModuleImport> includes) {
+            super(name, latestRevision, imports, includes);
+            this.belongsTo = belongsTo;
+        }
+
         /**
          * Returns name of parent module.
-         *
          */
         public String getParentModule() {
             return belongsTo;
         }
 
-        private SubmoduleDependencyInfo(final String name, final String latestRevision, final String belongsTo,
-                final ImmutableSet<ModuleImport> imports, final ImmutableSet<ModuleImport> includes) {
-            super(name, latestRevision, imports, includes);
-            this.belongsTo = belongsTo;
-        }
-
         @Override
         public String toString() {
-            return "Submodule [name=" + getName() + ", revision=" + getRevision() + ", dependencies="
-                    + getDependencies() + "]";
+            return "Submodule [name=" + getName() + ", revision="
+                    + getRevision() + ", dependencies=" + getDependencies()
+                    + "]";
         }
     }
 
     /**
-     * Utility implementation of {@link ModuleImport} to be used by
-     * {@link YangModelDependencyInfo}.
-     *
+     * Utility implementation of {@link ModuleImport} to be used by {@link YangModelDependencyInfo}.
      */
     private static final class ModuleImportImpl implements ModuleImport {
 
-        private final Date revision;
+        private final Revision revision;
+        private final SemVer semVer;
         private final String name;
 
-        public ModuleImportImpl(final String moduleName, final Date revision) {
-            this.name = moduleName;
+        ModuleImportImpl(final String moduleName, final Revision revision) {
+            this(moduleName, revision, null);
+        }
+
+        ModuleImportImpl(final String moduleName, @Nullable final Revision revision, @Nullable final SemVer semVer) {
+            this.name = requireNonNull(moduleName, "Module name must not be null.");
             this.revision = revision;
+            this.semVer = semVer;
         }
 
         @Override
         public String getModuleName() {
-            return this.name;
+            return name;
+        }
+
+        @Override
+        public Optional<Revision> getRevision() {
+            return Optional.ofNullable(revision);
         }
 
         @Override
-        public Date getRevision() {
-            return this.revision;
+        public Optional<SemVer> getSemanticVersion() {
+            return Optional.ofNullable(semVer);
         }
 
         @Override
@@ -340,8 +423,9 @@ public abstract class YangModelDependencyInfo {
         public int hashCode() {
             final int prime = 31;
             int result = 1;
-            result = prime * result + ((name == null) ? 0 : name.hashCode());
-            result = prime * result + ((revision == null) ? 0 : revision.hashCode());
+            result = prime * result + Objects.hashCode(name);
+            result = prime * result + Objects.hashCode(revision);
+            result = prime * result + Objects.hashCode(semVer);
             return result;
         }
 
@@ -356,7 +440,7 @@ public abstract class YangModelDependencyInfo {
             if (getClass() != obj.getClass()) {
                 return false;
             }
-            ModuleImportImpl other = (ModuleImportImpl) obj;
+            final ModuleImportImpl other = (ModuleImportImpl) obj;
             if (name == null) {
                 if (other.name != null) {
                     return false;
@@ -371,12 +455,17 @@ public abstract class YangModelDependencyInfo {
             } else if (!revision.equals(other.revision)) {
                 return false;
             }
+
+            if (!Objects.equals(getSemanticVersion(), other.getSemanticVersion())) {
+                return false;
+            }
             return true;
         }
 
         @Override
         public String toString() {
-            return "ModuleImportImpl [name=" + name + ", revision=" + QName.formattedRevision(revision) + "]";
+            return "ModuleImportImpl [name=" + name + ", revision="
+                    + QName.formattedRevision(Optional.ofNullable(revision)) + ", semanticVersion=" + semVer + "]";
         }
     }
 }