YANGTOOLS-706: Refactor YangInferencePipeline

[yangtools.git] / yang / yang-parser-impl / src / test / java / org / opendaylight / yangtools / yang / stmt / TestUtils.java

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/TestUtils.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/TestUtils.java
index 176764ee829c9c0724f4e1efecde9471e8533c54..c22ef08044accf5d539f8cc80cc2d83235afcfe6 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/TestUtils.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/TestUtils.java
@@ -35,14 +35,13 @@ import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 import org.opendaylight.yangtools.yang.model.parser.api.YangSyntaxErrorException;
 import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource;
 import org.opendaylight.yangtools.yang.model.repo.api.YinTextSchemaSource;
+import org.opendaylight.yangtools.yang.parser.impl.DefaultReactors;
 import org.opendaylight.yangtools.yang.parser.rfc6020.repo.YangStatementStreamSource;
 import org.opendaylight.yangtools.yang.parser.rfc6020.repo.YinStatementStreamSource;
 import org.opendaylight.yangtools.yang.parser.rfc6020.repo.YinTextToDomTransformer;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
 import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource;
-import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor;
 import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor.BuildAction;
-import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xml.sax.SAXException;
@@ -55,7 +54,7 @@ public final class TestUtils {
 
     public static SchemaContext loadModules(final URI resourceDirectory)
             throws ReactorException, IOException, YangSyntaxErrorException {
-        final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild();
+        final BuildAction reactor = DefaultReactors.defaultReactor().newBuild();
         File[] files = new File(resourceDirectory).listFiles();
 
         for (File file : files) {
@@ -71,7 +70,7 @@ public final class TestUtils {
 
     public static SchemaContext loadModuleResources(final Class<?> refClass, final String... resourceNames)
             throws IOException, ReactorException, YangSyntaxErrorException {
-        final BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild();
+        final BuildAction reactor = DefaultReactors.defaultReactor().newBuild();
 
         for (String resourceName : resourceNames) {
             reactor.addSource(YangStatementStreamSource.create(YangTextSchemaSource.forResource(refClass,
@@ -83,7 +82,7 @@ public final class TestUtils {
 
     public static SchemaContext loadYinModules(final URI resourceDirectory) throws ReactorException, SAXException,
             IOException {
-        final BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild();
+        final BuildAction reactor = DefaultReactors.defaultReactor().newBuild();
 
         for (File file : new File(resourceDirectory).listFiles()) {
             reactor.addSource(YinStatementStreamSource.create(YinTextToDomTransformer.transformSource(
@@ -95,7 +94,7 @@ public final class TestUtils {
 
     public static Module loadYinModule(final YinTextSchemaSource source) throws ReactorException, SAXException,
             IOException {
-        final SchemaContext ctx = YangInferencePipeline.RFC6020_REACTOR.newBuild()
+        final SchemaContext ctx = DefaultReactors.defaultReactor().newBuild()
                 .addSource(YinStatementStreamSource.create(YinTextToDomTransformer.transformSource(source)))
                 .buildEffective();
         return ctx.getModules().iterator().next();
@@ -199,12 +198,7 @@ public final class TestUtils {
     }
 
     public static SchemaContext parseYangSources(final StatementStreamSource... sources) throws ReactorException {
-
-        CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR
-                .newBuild();
-        reactor.addSources(sources);
-
-        return reactor.buildEffective();
+        return DefaultReactors.defaultReactor().newBuild().addSources(sources).buildEffective();
     }
 
     public static SchemaContext parseYangSources(final File... files)