Rehost SourceIdentifier methods

[yangtools.git] / parser / yang-parser-rfc7950 / src / test / java / org / opendaylight / yangtools / yang / stmt / StmtTestUtils.java

diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/StmtTestUtils.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/StmtTestUtils.java
index fbb2a7f24f66284677407fa37435ac560f0dec75..e760938fcafd02bc4eb0d86b297ede44802e9614 100644 (file)
--- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/StmtTestUtils.java
+++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/StmtTestUtils.java
@@ -145,16 +145,16 @@ public final class StmtTestUtils {
     }
 
     public static EffectiveModelContext parseYinSources(final String yinSourcesDirectoryPath,
-            final YangParserConfiguration config) throws URISyntaxException, SAXException, IOException,
-            ReactorException {
-        final URL resourceDir = StmtTestUtils.class.getResource(yinSourcesDirectoryPath);
-        final File[] files = new File(resourceDir.toURI()).listFiles(YIN_FILE_FILTER);
-        final StatementStreamSource[] sources = new StatementStreamSource[files.length];
+            final YangParserConfiguration config)
+                throws URISyntaxException, SAXException, IOException, ReactorException {
+        final var resourceDir = StmtTestUtils.class.getResource(yinSourcesDirectoryPath);
+        final var files = new File(resourceDir.toURI()).listFiles(YIN_FILE_FILTER);
+        final var sources = new StatementStreamSource[files.length];
         for (int i = 0; i < files.length; i++) {
-            final SourceIdentifier identifier = YinTextSource.identifierFromFilename(files[i].getName());
-
+            final var file = files[i];
             sources[i] = YinStatementStreamSource.create(YinTextToDomTransformer.transformSource(
-                YinTextSource.delegateForByteSource(identifier, Files.asByteSource(files[i]))));
+                YinTextSource.delegateForByteSource(SourceIdentifier.ofYinFileName(file.getName()),
+                    Files.asByteSource(file))));
         }
 
         return parseYinSources(config, sources);