Bug 4640: Change semantic-version to openconfig-version

[yangtools.git] / yang / yang-parser-impl / src / main / java / org / opendaylight / yangtools / yang / parser / repo / OpenconfigVerDependencyResolver.java

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/SemVerDependencyResolver.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/OpenconfigVerDependencyResolver.java
similarity index 71%
rename from yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/SemVerDependencyResolver.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/OpenconfigVerDependencyResolver.java
index 8567254762b5df868e44f4a13db1e4e07cd71e6e..3d7081d7bb8d5b9d206f93c33a91a7c29e05ec6e 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/SemVerDependencyResolver.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/OpenconfigVerDependencyResolver.java
@@ -13,13 +13,13 @@ import java.util.Map;
 import org.opendaylight.yangtools.concepts.SemVer;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.ModuleImport;
-import org.opendaylight.yangtools.yang.model.repo.api.SemVerSourceIdentifier;
+import org.opendaylight.yangtools.yang.model.repo.api.OpenconfigVerSourceIdentifier;
 import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier;
 import org.opendaylight.yangtools.yang.parser.impl.util.YangModelDependencyInfo;
 
-final class SemVerDependencyResolver extends DependencyResolver {
+final class OpenconfigVerDependencyResolver extends DependencyResolver {
 
-    protected SemVerDependencyResolver(final Map<SourceIdentifier, YangModelDependencyInfo> depInfo) {
+    protected OpenconfigVerDependencyResolver(final Map<SourceIdentifier, YangModelDependencyInfo> depInfo) {
         super(depInfo);
     }
 
@@ -27,7 +27,7 @@ final class SemVerDependencyResolver extends DependencyResolver {
         final String requestedModuleName = mi.getModuleName();
         for (SourceIdentifier r : haystack) {
             if (requestedModuleName.equals(r.getName())
-                    && isCompatible(((SemVerSourceIdentifier) r).getSemanticVersion(), mi.getSemanticVersion())) {
+                    && isCompatible(((OpenconfigVerSourceIdentifier) r).getOpenconfigVersion(), mi.getOpenconfigVersion())) {
                 return r;
             }
         }
@@ -42,7 +42,7 @@ final class SemVerDependencyResolver extends DependencyResolver {
     @Override
     protected boolean isKnown(final Collection<SourceIdentifier> haystack, final ModuleImport mi) {
         final String rev = mi.getRevision() != null ? QName.formattedRevision(mi.getRevision()) : null;
-        final SemVerSourceIdentifier msi = SemVerSourceIdentifier.create(mi.getModuleName(), Optional.fromNullable(rev), mi.getSemanticVersion());
+        final OpenconfigVerSourceIdentifier msi = OpenconfigVerSourceIdentifier.create(mi.getModuleName(), Optional.fromNullable(rev), mi.getOpenconfigVersion());
 
         // Quick lookup
         if (haystack.contains(msi)) {
@@ -53,7 +53,7 @@ final class SemVerDependencyResolver extends DependencyResolver {
         return findCompatibleVersion(haystack, mi) != null;
     }
 
-    public static SemVerDependencyResolver create(final Map<SourceIdentifier, YangModelDependencyInfo> depInfo) {
-        return new SemVerDependencyResolver(depInfo);
+    public static OpenconfigVerDependencyResolver create(final Map<SourceIdentifier, YangModelDependencyInfo> depInfo) {
+        return new OpenconfigVerDependencyResolver(depInfo);
     }
 }
\ No newline at end of file