Bug 4640: Change semantic-version to openconfig-version

[yangtools.git] / yang / yang-parser-impl / src / main / java / org / opendaylight / yangtools / yang / parser / impl / util / YangModelDependencyInfo.java

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 3ce0b60fe4dd7446c038801c9eabdf454fd4eaaa..53ba55347d5f52185a4b50063ca55640d8b97522 100644 (file)
--- 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
@@ -120,11 +120,11 @@ public abstract class YangModelDependencyInfo {
     }
 
     /**
-     * Returns semantic version of module
+     * Returns openconfig version of module
      *
-     * @return semantic version
+     * @return openconfig version
      */
-    public Optional<SemVer> getSemanticVersion() {
+    public Optional<SemVer> getOpenconfigVersion() {
         return semVer;
     }
 
@@ -224,7 +224,7 @@ public abstract class YangModelDependencyInfo {
     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.fromNullable(getSemanticVersion(module, sourceName));
+        final Optional<SemVer> semVer = Optional.fromNullable(getOpenconfigVersion(module, sourceName));
         final ImmutableSet<ModuleImport> imports = parseImports(module, sourceName);
         final ImmutableSet<ModuleImport> includes = parseIncludes(module, sourceName);
 
@@ -245,7 +245,7 @@ public abstract class YangModelDependencyInfo {
                         getReference(sourceName, subStatementContext));
                 final Date revisionDate = (revisionDateStr == null) ? null : QName
                         .parseRevision(revisionDateStr);
-                final Optional<SemVer> importSemVer = Optional.fromNullable(getSemanticVersion(subStatementContext, sourceName));
+                final Optional<SemVer> importSemVer = Optional.fromNullable(getOpenconfigVersion(subStatementContext, sourceName));
                 result.add(new ModuleImportImpl(importedModuleName,
                         revisionDate, importSemVer));
             }
@@ -253,10 +253,10 @@ public abstract class YangModelDependencyInfo {
         return ImmutableSet.copyOf(result);
     }
 
-    private static SemVer getSemanticVersion(final StatementContext statement, final String sourceName) {
+    private static SemVer getOpenconfigVersion(final StatementContext statement, final String sourceName) {
         final List<StatementContext> subStatements = statement.statement();
         String semVerString = null;
-        final String semVerStmtName = SupportedExtensionsMapping.SEMANTIC_VERSION.getStatementName().getLocalName();
+        final String semVerStmtName = SupportedExtensionsMapping.OPENCONFIG_VERSION.getStatementName().getLocalName();
         for (final StatementContext subStatement : subStatements) {
             final String subStatementName = Utils.trimPrefix(subStatement.keyword().getText());
             if (semVerStmtName.equals(subStatementName)) {
@@ -387,8 +387,7 @@ public abstract class YangModelDependencyInfo {
         @Override
         public String toString() {
             return "Module [name=" + getName() + ", revision=" + getRevision() + ", semanticVersion="
-                    + getSemanticVersion().or(Module.DEFAULT_SEMANTIC_VERSION) + ", dependencies=" + getDependencies()
-                    + "]";
+                    + getOpenconfigVersion().or(Module.DEFAULT_OPENCONFIG_VERSION) + ", dependencies=" + getDependencies() + "]";
         }
     }
 
@@ -445,7 +444,7 @@ public abstract class YangModelDependencyInfo {
         public ModuleImportImpl(final String moduleName, final Date revision, final Optional<SemVer> semVer) {
             this.name = Preconditions.checkNotNull(moduleName, "Module name must not be null.");
             this.revision = revision;
-            this.semVer = semVer.or(Module.DEFAULT_SEMANTIC_VERSION);
+            this.semVer = semVer.or(Module.DEFAULT_OPENCONFIG_VERSION);
         }
 
         @Override
@@ -459,7 +458,7 @@ public abstract class YangModelDependencyInfo {
         }
 
         @Override
-        public SemVer getSemanticVersion() {
+        public SemVer getOpenconfigVersion() {
             return this.semVer;
         }
 
@@ -505,7 +504,7 @@ public abstract class YangModelDependencyInfo {
                 return false;
             }
 
-            if (!Objects.equals(getSemanticVersion(), other.getSemanticVersion())) {
+            if (!Objects.equals(getOpenconfigVersion(), other.getOpenconfigVersion())) {
                 return false;
             }
             return true;
@@ -514,7 +513,7 @@ public abstract class YangModelDependencyInfo {
         @Override
         public String toString() {
             return "ModuleImportImpl [name=" + name + ", revision="
-                    + QName.formattedRevision(revision) + ", semanticVersion=" + getSemanticVersion() + "]";
+                    + QName.formattedRevision(revision) + ", semanticVersion=" + getOpenconfigVersion() + "]";
         }
     }
 }