Promote SchemaSourceRepresentation

[yangtools.git] / parser / yang-parser-rfc7950 / src / main / java / org / opendaylight / yangtools / yang / parser / rfc7950 / repo / YangModelDependencyInfo.java

diff --git a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangModelDependencyInfo.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangModelDependencyInfo.java
index 48027e0980e578076f34be59c61fc68e83c92ac6..5845fb2ec537b669f951c20cdd97edf66fd57810 100644 (file)
--- a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangModelDependencyInfo.java
+++ b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangModelDependencyInfo.java
@@ -24,13 +24,13 @@ import org.opendaylight.yangtools.yang.ir.IRArgument;
 import org.opendaylight.yangtools.yang.ir.IRKeyword;
 import org.opendaylight.yangtools.yang.ir.IRKeyword.Unqualified;
 import org.opendaylight.yangtools.yang.ir.IRStatement;
+import org.opendaylight.yangtools.yang.ir.YangIRSchemaSource;
 import org.opendaylight.yangtools.yang.model.api.ModuleImport;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementSourceReference;
+import org.opendaylight.yangtools.yang.model.api.source.SourceIdentifier;
 import org.opendaylight.yangtools.yang.model.api.stmt.ImportEffectiveStatement;
-import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier;
-import org.opendaylight.yangtools.yang.model.repo.api.YangIRSchemaSource;
-import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource;
+import org.opendaylight.yangtools.yang.model.spi.source.YangTextSource;
 import org.opendaylight.yangtools.yang.parser.api.YangSyntaxErrorException;
 import org.opendaylight.yangtools.yang.parser.spi.source.ExplicitStatement;
 
@@ -133,44 +133,44 @@ public abstract class YangModelDependencyInfo {
      * @throws IllegalArgumentException If the root statement is not a valid YANG module/submodule
      */
     public static @NonNull YangModelDependencyInfo forIR(final YangIRSchemaSource source) {
-        return forIR(source.getRootStatement(), source.getIdentifier());
+        return forIR(source.getRootStatement(), source.sourceId());
     }
 
     /**
      * Extracts {@link YangModelDependencyInfo} from an intermediate representation root statement of a YANG model.
      *
-     * @param source Source identifier
+     * @param sourceId Source identifier
      * @param rootStatement root statement
      * @return {@link YangModelDependencyInfo}
      * @throws IllegalArgumentException If the root statement is not a valid YANG module/submodule
      */
     static @NonNull YangModelDependencyInfo forIR(final IRStatement rootStatement,
-            final SourceIdentifier source) {
+            final SourceIdentifier sourceId) {
         final IRKeyword keyword = rootStatement.keyword();
         checkArgument(keyword instanceof Unqualified, "Invalid root statement %s", keyword);
 
         final String arg = keyword.identifier();
         if (MODULE.equals(arg)) {
-            return parseModuleContext(rootStatement, source);
+            return parseModuleContext(rootStatement, sourceId);
         }
         if (SUBMODULE.equals(arg)) {
-            return parseSubmoduleContext(rootStatement, source);
+            return parseSubmoduleContext(rootStatement, sourceId);
         }
         throw new IllegalArgumentException("Root of parsed AST must be either module or submodule");
     }
 
     /**
-     * Extracts {@link YangModelDependencyInfo} from a {@link YangTextSchemaSource}. This parsing does not
-     * validate full YANG module, only parses header up to the revisions and imports.
+     * Extracts {@link YangModelDependencyInfo} from a {@link YangTextSource}. This parsing does not validate full YANG
+     * module, only parses header up to the revisions and imports.
      *
-     * @param yangText {@link YangTextSchemaSource}
+     * @param yangText {@link YangTextSource}
      * @return {@link YangModelDependencyInfo}
      * @throws YangSyntaxErrorException If the resource does not pass syntactic analysis
      * @throws IOException When the resource cannot be read
      */
-    public static YangModelDependencyInfo forYangText(final YangTextSchemaSource yangText)
+    public static YangModelDependencyInfo forYangText(final YangTextSource yangText)
             throws IOException, YangSyntaxErrorException {
-        final YangStatementStreamSource source = YangStatementStreamSource.create(yangText);
+        final var source = YangStatementStreamSource.create(yangText);
         return forIR(source.rootStatement(), source.getIdentifier());
     }