Merge pull request #258 from Tobianas/mainCalcium

Calcium integration
PANTHEONtech · May 7, 2024 · edb714c · edb714c
2 parents eff811f + 165907b
commit edb714c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>io.lighty.core</groupId>
         <artifactId>lighty-parent</artifactId>
-        <version>19.0.0</version>
+        <version>20.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/src/main/java/io/lighty/yang/validator/YangContextFactory.java b/src/main/java/io/lighty/yang/validator/YangContextFactory.java
@@ -22,8 +22,9 @@
 import org.opendaylight.yangtools.yang.common.YangConstants;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.model.api.Module;
+import org.opendaylight.yangtools.yang.model.api.source.YangTextSource;
 import org.opendaylight.yangtools.yang.model.api.stmt.FeatureSet;
-import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource;
+import org.opendaylight.yangtools.yang.model.spi.source.FileYangTextSource;
 import org.opendaylight.yangtools.yang.parser.api.YangParser;
 import org.opendaylight.yangtools.yang.parser.api.YangParserException;
 import org.opendaylight.yangtools.yang.parser.api.YangParserFactory;
@@ -70,17 +71,17 @@ EffectiveModelContext createContext(final boolean useAllFiles) throws IOExceptio
 
         final List<String> names = new ArrayList<>();
         for (final File file : testFiles) {
-            final YangTextSchemaSource yangTextSchemaSource = YangTextSchemaSource.forPath(file.toPath());
-            names.add(yangTextSchemaSource.getIdentifier().name().getLocalName());
-            parser.addSource(yangTextSchemaSource);
+            final YangTextSource yangTextSource = new FileYangTextSource(file.toPath());
+            names.add(yangTextSource.sourceId().name().getLocalName());
+            parser.addSource(yangTextSource);
         }
         for (final File file : libFiles) {
-            final YangTextSchemaSource yangTextSchemaSource = YangTextSchemaSource.forPath(file.toPath());
-            if (!names.contains(yangTextSchemaSource.getIdentifier().name().getLocalName())) {
+            final YangTextSource yangTextSource = new FileYangTextSource(file.toPath());
+            if (!names.contains(yangTextSource.sourceId().name().getLocalName())) {
                 if (useAllFiles) {
-                    parser.addSource(yangTextSchemaSource);
+                    parser.addSource(yangTextSource);
                 } else {
-                    parser.addLibSource(YangTextSchemaSource.forPath(file.toPath()));
+                    parser.addLibSource(new FileYangTextSource(file.toPath()));
                 }
             }
         }

diff --git a/src/main/java/io/lighty/yang/validator/simplify/stream/TrackingXmlParserStream.java b/src/main/java/io/lighty/yang/validator/simplify/stream/TrackingXmlParserStream.java
@@ -117,7 +117,7 @@ public TrackingXmlParserStream parse(final XMLStreamReader reader) throws XMLStr
         if (reader.hasNext()) {
             reader.nextTag();
             final var nodeDataWithSchema = AbstractNodeDataWithSchema.of(parentNode);
-            final SchemaInferenceStack schemaIS = SchemaInferenceStack.of(codecs.getEffectiveModelContext());
+            final SchemaInferenceStack schemaIS = SchemaInferenceStack.of(codecs.modelContext());
             read(reader, nodeDataWithSchema, reader.getLocalName(), tree, schemaIS);
             nodeDataWithSchema.write(writer);
         }