Revert "Bug 4640: Change semantic-version to openconfig-version"

[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 884e2b7da39786f49ee578027e0330145d214b2a..77337197b990d5cadb6c70206c24999265531a61 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
@@ -39,13 +39,13 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.InferenceException;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ModelActionBuilder;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ModelActionBuilder.InferenceAction;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ModelActionBuilder.Prerequisite;
-import org.opendaylight.yangtools.yang.parser.spi.meta.OpenconfigVersionModuleNamespace;
-import org.opendaylight.yangtools.yang.parser.spi.meta.OpenconfigVersionNamespace;
+import org.opendaylight.yangtools.yang.parser.spi.meta.SemanticVersionModuleNamespace;
+import org.opendaylight.yangtools.yang.parser.spi.meta.SemanticVersionNamespace;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable;
 import org.opendaylight.yangtools.yang.parser.spi.source.ImpPrefixToModuleIdentifier;
 import org.opendaylight.yangtools.yang.parser.spi.source.ImpPrefixToNamespace;
-import org.opendaylight.yangtools.yang.parser.spi.source.ImpPrefixToOpenconfigVerModuleIdentifier;
+import org.opendaylight.yangtools.yang.parser.spi.source.ImpPrefixToSemVerModuleIdentifier;
 import org.opendaylight.yangtools.yang.parser.spi.source.ImportedModuleContext;
 import org.opendaylight.yangtools.yang.parser.spi.source.ModuleCtxToModuleIdentifier;
 import org.opendaylight.yangtools.yang.parser.spi.source.ModuleNameToNamespace;
@@ -58,7 +58,7 @@ public class ImportStatementDefinition extends
             .builder(YangStmtMapping.IMPORT)
             .addMandatory(YangStmtMapping.PREFIX)
             .addOptional(YangStmtMapping.REVISION_DATE)
-            .addOptional(SupportedExtensionsMapping.OPENCONFIG_VERSION)
+            .addOptional(SupportedExtensionsMapping.SEMANTIC_VERSION)
             .build();
 
     public ImportStatementDefinition() {
@@ -123,8 +123,8 @@ public class ImportStatementDefinition extends
     @Override
     public void onLinkageDeclared(
             final Mutable<String, ImportStatement, EffectiveStatement<String, ImportStatement>> stmt) {
-        if (stmt.isEnabledOpenconfigVersioning()) {
-            OpenconfigVersionImport.onLinkageDeclared(stmt);
+        if (stmt.isEnabledSemanticVersioning()) {
+            SemanticVersionImport.onLinkageDeclared(stmt);
         } else {
             RevisionImport.onLinkageDeclared(stmt);
         }
@@ -219,8 +219,8 @@ public class ImportStatementDefinition extends
         }
     }
 
-    private static class OpenconfigVersionImport {
-        private OpenconfigVersionImport() {
+    private static class SemanticVersionImport {
+        private SemanticVersionImport() {
             throw new UnsupportedOperationException("Utility class");
         }
 
@@ -245,7 +245,7 @@ public class ImportStatementDefinition extends
                     if (importedModuleEntry != null) {
                         importedModule = importedModuleEntry.getValue();
                         importedModuleIdentifier = importedModule.getFromNamespace(ModuleCtxToModuleIdentifier.class, importedModule);
-                        semVerModuleIdentifier = createOpenconfigVerModuleIdentifier(importedModuleIdentifier, importedModuleEntry.getKey());
+                        semVerModuleIdentifier = createSemVerModuleIdentifier(importedModuleIdentifier, importedModuleEntry.getKey());
                     } else {
                         throw new InferenceException(stmt.getStatementSourceReference(),
                                 "Unable to find module compatible with requested import [%s(%s)].", impIdentifier
@@ -255,7 +255,7 @@ public class ImportStatementDefinition extends
                     linkageTarget.get().addToNs(ImportedModuleContext.class, importedModuleIdentifier, importedModule);
                     final String impPrefix = firstAttributeOf(stmt.declaredSubstatements(), PrefixStatement.class);
                     stmt.addToNs(ImpPrefixToModuleIdentifier.class, impPrefix, importedModuleIdentifier);
-                    stmt.addToNs(ImpPrefixToOpenconfigVerModuleIdentifier.class, impPrefix, semVerModuleIdentifier);
+                    stmt.addToNs(ImpPrefixToSemVerModuleIdentifier.class, impPrefix, semVerModuleIdentifier);
 
                     final URI modNs = firstAttributeOf(importedModule.declaredSubstatements(), NamespaceStatement.class);
                     stmt.addToNs(URIStringToImpPrefix.class, modNs.toString(), impPrefix);
@@ -273,9 +273,9 @@ public class ImportStatementDefinition extends
         }
 
         private static SemVer getRequestedImportVersion(final Mutable<?, ?, ?> impStmt) {
-            SemVer requestedImportVersion = impStmt.getFromNamespace(OpenconfigVersionNamespace.class, impStmt);
+            SemVer requestedImportVersion = impStmt.getFromNamespace(SemanticVersionNamespace.class, impStmt);
             if (requestedImportVersion == null) {
-                requestedImportVersion = Module.DEFAULT_OPENCONFIG_VERSION;
+                requestedImportVersion = Module.DEFAULT_SEMANTIC_VERSION;
             }
             return requestedImportVersion;
         }
@@ -283,7 +283,7 @@ public class ImportStatementDefinition extends
         private static Entry<SemVer, StmtContext<?, ?, ?>> findRecentCompatibleModuleEntry(final String moduleName,
                 final Mutable<String, ImportStatement, EffectiveStatement<String, ImportStatement>> impStmt) {
             NavigableMap<SemVer, StmtContext<?, ?, ?>> allRelevantModulesMap = impStmt.getFromNamespace(
-                    OpenconfigVersionModuleNamespace.class, moduleName);
+                    SemanticVersionModuleNamespace.class, moduleName);
             if (allRelevantModulesMap == null) {
                 return null;
             }
@@ -303,7 +303,7 @@ public class ImportStatementDefinition extends
                     Optional.of(SimpleDateFormatUtil.DEFAULT_DATE_IMP));
         }
 
-        private static ModuleIdentifier createOpenconfigVerModuleIdentifier(final ModuleIdentifier importedModuleIdentifier,
+        private static ModuleIdentifier createSemVerModuleIdentifier(final ModuleIdentifier importedModuleIdentifier,
                 final SemVer semVer) {
             return ModuleIdentifierImpl.create(importedModuleIdentifier.getName(),
                 Optional.ofNullable(importedModuleIdentifier.getNamespace()),