Refactor RFC7950Reactors

This patch corrects {Default,RFC7950}Reactors behavior, eliminating
YangInferencePipeline in the process.

Change-Id: Ica2ecac0baa5bdacb7456aa733b13230cb9c54c5
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/yang/rfc7952-parser-support/src/test/java/org/opendaylight/yangtools/rfc7952/parser/AnnotationTest.java b/yang/rfc7952-parser-support/src/test/java/org/opendaylight/yangtools/rfc7952/parser/AnnotationTest.java
index 89aac0a73aa4af1ff1f8642402a87a49c8460645..63653d55a015b960d62d3cd9ac11c8603779df0a 100644 (file)
--- a/yang/rfc7952-parser-support/src/test/java/org/opendaylight/yangtools/rfc7952/parser/AnnotationTest.java
+++ b/yang/rfc7952-parser-support/src/test/java/org/opendaylight/yangtools/rfc7952/parser/AnnotationTest.java
@@ -23,7 +23,7 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.parser.api.YangSyntaxErrorException;
 import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource;
 import org.opendaylight.yangtools.yang.model.util.type.BaseTypes;
-import org.opendaylight.yangtools.yang.parser.rfc7950.reactor.CustomStatementParserBuilder;
+import org.opendaylight.yangtools.yang.parser.rfc7950.reactor.RFC7950Reactors;
 import org.opendaylight.yangtools.yang.parser.rfc7950.repo.YangStatementStreamSource;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ModelProcessingPhase;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
@@ -37,8 +37,7 @@ public class AnnotationTest {
 
     @BeforeClass
     public static void createReactor() {
-        reactor = new CustomStatementParserBuilder()
-                .addDefaultRFC6020Bundles()
+        reactor = RFC7950Reactors.vanillaReactorBuilder()
                 .addAllCommonStatementSupports(ModelProcessingPhase.FULL_DECLARATION, Metadata.getStatements())
                 .build();
     }

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/DefaultReactors.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/DefaultReactors.java
index 6bc8406594ca72676162261789a201945648bdd3..241c8ef8b8bda1ab1977b817d5025801699398a1 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/DefaultReactors.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/DefaultReactors.java
@@ -7,10 +7,17 @@
  */
 package org.opendaylight.yangtools.yang.parser.impl;
 
+import static org.opendaylight.yangtools.yang.parser.spi.meta.NamespaceBehaviour.treeScoped;
+
 import com.google.common.annotations.Beta;
-import org.opendaylight.yangtools.yang.parser.rfc7950.reactor.YangInferencePipeline;
+import org.opendaylight.yangtools.yang.parser.odlext.namespace.AnyxmlSchemaLocationNamespace;
+import org.opendaylight.yangtools.yang.parser.odlext.stmt.AnyxmlSchemaLocationSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.reactor.CustomCrossSourceStatementReactorBuilder;
+import org.opendaylight.yangtools.yang.parser.rfc7950.reactor.RFC7950Reactors;
+import org.opendaylight.yangtools.yang.parser.spi.meta.ModelProcessingPhase;
 import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor;
 import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor.Builder;
+import org.opendaylight.yangtools.yang.parser.stmt.rfc8040.YangDataStatementSupport;
 
 /**
  * Utility class for instantiating default-configured {@link CrossSourceStatementReactor}s.
@@ -19,7 +26,7 @@ import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementR
  */
 @Beta
 public final class DefaultReactors {
-    private static final CrossSourceStatementReactor DEFAULT_REACTOR = createDefaultReactorBuilder().build();
+    private static final CrossSourceStatementReactor DEFAULT_REACTOR = defaultReactorBuilder().build();
 
     private DefaultReactors() {
         throw new UnsupportedOperationException();
@@ -41,8 +48,13 @@ public final class DefaultReactors {
      *
      * @return A populated CrossSourceStatementReactor builder.
      */
-    public static Builder createDefaultReactorBuilder() {
-        // FIXME: customize with extensions
-        return YangInferencePipeline.newReactorBuilder();
+    public static CustomCrossSourceStatementReactorBuilder defaultReactorBuilder() {
+        return RFC7950Reactors.defaultReactorBuilder()
+                // AnyxmlSchemaLocation support
+                .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, AnyxmlSchemaLocationSupport.getInstance())
+                .addNamespaceSupport(ModelProcessingPhase.FULL_DECLARATION,
+                    treeScoped(AnyxmlSchemaLocationNamespace.class))
+                // RFC8040 yang-data support.
+                .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, YangDataStatementSupport.getInstance());
     }
 }

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/CustomStatementParserBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/CustomCrossSourceStatementReactorBuilder.java
similarity index 70%
rename from yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/CustomStatementParserBuilder.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/CustomCrossSourceStatementReactorBuilder.java
index ffdb78aa3f273b4b127107fad4e465f27f0e7ec5..84f32fab890d69e9e812add3cdd52f556914b0f3 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/CustomStatementParserBuilder.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/CustomCrossSourceStatementReactorBuilder.java
@@ -7,6 +7,7 @@
  */
 package org.opendaylight.yangtools.yang.parser.rfc7950.reactor;
 
+import com.google.common.annotations.Beta;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Table;
 import com.google.common.collect.Table.Cell;
@@ -15,6 +16,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import org.opendaylight.yangtools.concepts.Builder;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.YangVersion;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
@@ -24,31 +26,20 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.StatementSupport;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StatementSupportBundle;
 import org.opendaylight.yangtools.yang.parser.spi.validation.ValidationBundlesNamespace.ValidationBundleType;
 import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor;
-import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor.Builder;
 
-public class CustomStatementParserBuilder {
+@Beta
+public class CustomCrossSourceStatementReactorBuilder implements Builder<CrossSourceStatementReactor> {
     private final Map<ModelProcessingPhase, StatementSupportBundle.Builder> reactorSupportBundles;
     private final Map<ValidationBundleType, Collection<StatementDefinition>> reactorValidationBundles = new HashMap<>();
 
     /**
-     * Creates a new CustomStatementParserBuilder object initialized by
-     * YangInferencePipeline.SUPPORTED_VERSION_BUNDLE. Statement parser will
-     * support the same versions as defined in
-     * YangInferencePipeline.SUPPORTED_VERSION_BUNDLE.
-     */
-    public CustomStatementParserBuilder() {
-        this(YangInferencePipeline.SUPPORTED_VERSIONS);
-    }
-
-    /**
-     * Creates a new CustomStatementParserBuilder object initialized by specific
-     * version bundle. Statement parser will support all versions defined in
-     * given version bundle.
+     * Creates a new CustomCrossSourceStatementReactorBuilder object initialized by specific version bundle. Statement
+     * parser will support all versions defined in given version bundle.
      *
      * @param supportedVersions
      *            bundle of supported verions
      */
-    public CustomStatementParserBuilder(final Set<YangVersion> supportedVersions) {
+    CustomCrossSourceStatementReactorBuilder(final Set<YangVersion> supportedVersions) {
         reactorSupportBundles = ImmutableMap.<ModelProcessingPhase, StatementSupportBundle.Builder>builder()
                 .put(ModelProcessingPhase.INIT, StatementSupportBundle.builder(supportedVersions))
                 .put(ModelProcessingPhase.SOURCE_PRE_LINKAGE, StatementSupportBundle.builder(supportedVersions))
@@ -58,42 +49,25 @@ public class CustomStatementParserBuilder {
                 .put(ModelProcessingPhase.EFFECTIVE_MODEL, StatementSupportBundle.builder(supportedVersions)).build();
     }
 
-    public CustomStatementParserBuilder addStatementSupport(final ModelProcessingPhase phase,
+    public CustomCrossSourceStatementReactorBuilder addStatementSupport(final ModelProcessingPhase phase,
             final StatementSupport<?, ?, ?> stmtSupport) {
         reactorSupportBundles.get(phase).addSupport(stmtSupport);
         return this;
     }
 
-    public CustomStatementParserBuilder addNamespaceSupport(final ModelProcessingPhase phase,
+    public CustomCrossSourceStatementReactorBuilder addNamespaceSupport(final ModelProcessingPhase phase,
             final NamespaceBehaviour<?, ?, ?> namespaceSupport) {
         reactorSupportBundles.get(phase).addSupport(namespaceSupport);
         return this;
     }
 
-    public CustomStatementParserBuilder addDefaultRFC6020Bundles() {
-        addRFC6020SupportBundles();
-        addRFC6020ValidationBundles();
-        return this;
-    }
-
-    private void addRFC6020ValidationBundles() {
-        reactorValidationBundles.putAll(YangInferencePipeline.RFC6020_VALIDATION_BUNDLE);
-    }
-
-    private void addRFC6020SupportBundles() {
-        for (final Entry<ModelProcessingPhase, StatementSupportBundle> entry : YangInferencePipeline.RFC6020_BUNDLES
-                .entrySet()) {
-            addAllSupports(entry.getKey(), entry.getValue());
-        }
-    }
-
-    public CustomStatementParserBuilder addValidationBundle(final ValidationBundleType validationBundleType,
+    public CustomCrossSourceStatementReactorBuilder addValidationBundle(final ValidationBundleType validationBundleType,
             final Collection<StatementDefinition> validationBundle) {
         reactorValidationBundles.put(validationBundleType, validationBundle);
         return this;
     }
 
-    public CustomStatementParserBuilder addAllSupports(final ModelProcessingPhase phase,
+    public CustomCrossSourceStatementReactorBuilder addAllSupports(final ModelProcessingPhase phase,
             final StatementSupportBundle stmtSupportBundle) {
         addAllCommonStatementSupports(phase, stmtSupportBundle.getCommonDefinitions().values());
         addAllVersionSpecificSupports(phase, stmtSupportBundle.getAllVersionSpecificDefinitions());
@@ -101,7 +75,7 @@ public class CustomStatementParserBuilder {
         return this;
     }
 
-    public CustomStatementParserBuilder addAllNamespaceSupports(final ModelProcessingPhase phase,
+    public CustomCrossSourceStatementReactorBuilder addAllNamespaceSupports(final ModelProcessingPhase phase,
             final Collection<NamespaceBehaviour<?, ?, ?>> namespaceSupports) {
         final StatementSupportBundle.Builder stmtBundleBuilder = reactorSupportBundles.get(phase);
         for (final NamespaceBehaviour<?, ?, ?> namespaceSupport : namespaceSupports) {
@@ -110,18 +84,7 @@ public class CustomStatementParserBuilder {
         return this;
     }
 
-    /**
-     * Use
-     * {@link #addAllCommonStatementSupports(ModelProcessingPhase, Collection)
-     * addAllCommonStatementSupports} method instead.
-     */
-    @Deprecated
-    public CustomStatementParserBuilder addAllStatementSupports(final ModelProcessingPhase phase,
-            final Collection<StatementSupport<?, ?, ?>> statementSupports) {
-        return addAllCommonStatementSupports(phase, statementSupports);
-    }
-
-    public CustomStatementParserBuilder addAllCommonStatementSupports(final ModelProcessingPhase phase,
+    public CustomCrossSourceStatementReactorBuilder addAllCommonStatementSupports(final ModelProcessingPhase phase,
             final Collection<StatementSupport<?, ?, ?>> statementSupports) {
         final StatementSupportBundle.Builder stmtBundleBuilder = reactorSupportBundles.get(phase);
         for (final StatementSupport<?, ?, ?> statementSupport : statementSupports) {
@@ -130,7 +93,7 @@ public class CustomStatementParserBuilder {
         return this;
     }
 
-    public CustomStatementParserBuilder addAllVersionSpecificSupports(final ModelProcessingPhase phase,
+    public CustomCrossSourceStatementReactorBuilder addAllVersionSpecificSupports(final ModelProcessingPhase phase,
             final Table<YangVersion, QName, StatementSupport<?, ?, ?>> versionSpecificSupports) {
         final StatementSupportBundle.Builder stmtBundleBuilder = reactorSupportBundles.get(phase);
         for (final Cell<YangVersion, QName, StatementSupport<?, ?, ?>> cell : versionSpecificSupports.cellSet()) {
@@ -139,6 +102,7 @@ public class CustomStatementParserBuilder {
         return this;
     }
 
+    @Override
     public CrossSourceStatementReactor build() {
         final StatementSupportBundle initBundle = reactorSupportBundles.get(ModelProcessingPhase.INIT).build();
         final StatementSupportBundle preLinkageBundle = reactorSupportBundles
@@ -152,7 +116,7 @@ public class CustomStatementParserBuilder {
         final StatementSupportBundle effectiveBundle = reactorSupportBundles.get(ModelProcessingPhase.EFFECTIVE_MODEL)
                 .setParent(fullDeclBundle).build();
 
-        final Builder reactorBuilder = CrossSourceStatementReactor.builder()
+        final CrossSourceStatementReactor.Builder reactorBuilder = CrossSourceStatementReactor.builder()
                 .setBundle(ModelProcessingPhase.INIT, initBundle)
                 .setBundle(ModelProcessingPhase.SOURCE_PRE_LINKAGE, preLinkageBundle)
                 .setBundle(ModelProcessingPhase.SOURCE_LINKAGE, linkageBundle)

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/RFC7950Reactors.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/RFC7950Reactors.java
index bad402dfea99077345f281ec5a84f8d3e6ddaccb..700085ad6a32adc997c738071f2c9c3935592d72 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/RFC7950Reactors.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/RFC7950Reactors.java
@@ -7,7 +7,152 @@
  */
 package org.opendaylight.yangtools.yang.parser.rfc7950.reactor;
 
+import static org.opendaylight.yangtools.yang.common.YangVersion.VERSION_1;
+import static org.opendaylight.yangtools.yang.common.YangVersion.VERSION_1_1;
+import static org.opendaylight.yangtools.yang.parser.spi.meta.NamespaceBehaviour.global;
+import static org.opendaylight.yangtools.yang.parser.spi.meta.NamespaceBehaviour.sourceLocal;
+import static org.opendaylight.yangtools.yang.parser.spi.meta.NamespaceBehaviour.treeScoped;
+
 import com.google.common.annotations.Beta;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Sets;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+import org.opendaylight.yangtools.yang.common.YangVersion;
+import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
+import org.opendaylight.yangtools.yang.parser.openconfig.stmt.OpenConfigVersionSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.namespace.ChildSchemaNodeNamespace;
+import org.opendaylight.yangtools.yang.parser.rfc7950.namespace.SchemaNodeIdentifierBuildNamespace;
+import org.opendaylight.yangtools.yang.parser.rfc7950.namespace.URIStringToImportPrefix;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.action.ActionStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.anydata.AnydataStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.anyxml.AnyxmlStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.argument.ArgumentStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.augment.AugmentStatementRFC6020Support;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.augment.AugmentStatementRFC7950Support;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.base.BaseStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.belongs_to.BelongsToStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.bit.BitStatementRFC6020Support;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.bit.BitStatementRFC7950Support;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.case_.CaseStatementRFC6020Support;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.case_.CaseStatementRFC7950Support;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.choice.ChoiceStatementRFC6020Support;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.choice.ChoiceStatementRFC7950Support;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.config.ConfigStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.contact.ContactStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.container.ContainerStatementRFC6020Support;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.container.ContainerStatementRFC7950Support;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.default_.DefaultStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.description.DescriptionStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.deviate.DeviateStatementRFC6020Support;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.deviate.DeviateStatementRFC7950Support;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.deviation.DeviationStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.enum_.EnumStatementRFC6020Support;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.enum_.EnumStatementRFC7950Support;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.error_app_tag.ErrorAppTagStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.error_message.ErrorMessageStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.extension.ExtensionStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.feature.FeatureStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.fraction_digits.FractionDigitsStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.grouping.GroupingStatementRFC6020Support;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.grouping.GroupingStatementRFC7950Support;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.identity.IdentityStatementRFC6020Support;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.identity.IdentityStatementRFC7950Support;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.if_feature.IfFeatureStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.import_.ImportStatementRFC6020Support;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.import_.ImportStatementRFC7950Support;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.include.IncludeStatementRFC6020Support;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.include.IncludeStatementRFC7950Support;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.input.InputStatementRFC6020Support;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.input.InputStatementRFC7950Support;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.key.KeyStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.leaf.LeafStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.leaf_list.LeafListStatementRFC6020Support;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.leaf_list.LeafListStatementRFC7950Support;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.length.LengthStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.list.ListStatementRFC6020Support;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.list.ListStatementRFC7950Support;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.mandatory.MandatoryStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.max_elements.MaxElementsStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.min_elements.MinElementsStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.modifier.ModifierStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.module.ModuleStatementRFC6020Support;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.module.ModuleStatementRFC7950Support;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.must.MustStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.namespace.NamespaceStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.notification.NotificationStatementRFC6020Support;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.notification.NotificationStatementRFC7950Support;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.ordered_by.OrderedByStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.organization.OrganizationStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.output.OutputStatementRFC6020Support;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.output.OutputStatementRFC7950Support;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.path.PathStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.pattern.PatternStatementRFC6020Support;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.pattern.PatternStatementRFC7950Support;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.position.PositionStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.prefix.PrefixStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.presence.PresenceStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.range.RangeStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.reference.ReferenceStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.refine.RefineStatementRFC6020Support;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.refine.RefineStatementRFC7950Support;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.require_instance.RequireInstanceStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.revision.RevisionStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.revision_date.RevisionDateStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.rpc.RpcStatementRFC6020Support;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.rpc.RpcStatementRFC7950Support;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.status.StatusStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.submodule.SubmoduleStatementRFC6020Support;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.submodule.SubmoduleStatementRFC7950Support;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.type.TypeStatementRFC6020Support;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.type.TypeStatementRFC7950Support;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.typedef.TypedefStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.unique.UniqueStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.units.UnitsStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.uses.UsesStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.value.ValueStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.when.WhenStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.yang_version.YangVersionStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.yin_element.YinElementStatementSupport;
+import org.opendaylight.yangtools.yang.parser.spi.ExtensionNamespace;
+import org.opendaylight.yangtools.yang.parser.spi.GroupingNamespace;
+import org.opendaylight.yangtools.yang.parser.spi.IdentityNamespace;
+import org.opendaylight.yangtools.yang.parser.spi.ModuleNamespace;
+import org.opendaylight.yangtools.yang.parser.spi.NamespaceToModule;
+import org.opendaylight.yangtools.yang.parser.spi.PreLinkageModuleNamespace;
+import org.opendaylight.yangtools.yang.parser.spi.SubmoduleNamespace;
+import org.opendaylight.yangtools.yang.parser.spi.TypeNamespace;
+import org.opendaylight.yangtools.yang.parser.spi.meta.DerivedIdentitiesNamespace;
+import org.opendaylight.yangtools.yang.parser.spi.meta.ModelProcessingPhase;
+import org.opendaylight.yangtools.yang.parser.spi.meta.QNameCacheNamespace;
+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.StatementDefinitionNamespace;
+import org.opendaylight.yangtools.yang.parser.spi.meta.StatementSupportBundle;
+import org.opendaylight.yangtools.yang.parser.spi.source.AugmentToChoiceNamespace;
+import org.opendaylight.yangtools.yang.parser.spi.source.BelongsToModuleContext;
+import org.opendaylight.yangtools.yang.parser.spi.source.BelongsToPrefixToModuleCtx;
+import org.opendaylight.yangtools.yang.parser.spi.source.BelongsToPrefixToModuleName;
+import org.opendaylight.yangtools.yang.parser.spi.source.ImpPrefixToNamespace;
+import org.opendaylight.yangtools.yang.parser.spi.source.ImportPrefixToModuleCtx;
+import org.opendaylight.yangtools.yang.parser.spi.source.ImportPrefixToSemVerSourceIdentifier;
+import org.opendaylight.yangtools.yang.parser.spi.source.ImportedModuleContext;
+import org.opendaylight.yangtools.yang.parser.spi.source.IncludedModuleContext;
+import org.opendaylight.yangtools.yang.parser.spi.source.IncludedSubmoduleNameToModuleCtx;
+import org.opendaylight.yangtools.yang.parser.spi.source.ModuleCtxToModuleQName;
+import org.opendaylight.yangtools.yang.parser.spi.source.ModuleCtxToSourceIdentifier;
+import org.opendaylight.yangtools.yang.parser.spi.source.ModuleNameToModuleQName;
+import org.opendaylight.yangtools.yang.parser.spi.source.ModuleNameToNamespace;
+import org.opendaylight.yangtools.yang.parser.spi.source.ModuleNamespaceForBelongsTo;
+import org.opendaylight.yangtools.yang.parser.spi.source.ModuleQNameToModuleName;
+import org.opendaylight.yangtools.yang.parser.spi.source.ModulesDeviatedByModules;
+import org.opendaylight.yangtools.yang.parser.spi.source.PrefixToModule;
+import org.opendaylight.yangtools.yang.parser.spi.source.QNameToStatementDefinition;
+import org.opendaylight.yangtools.yang.parser.spi.source.StmtOrderingNamespace;
+import org.opendaylight.yangtools.yang.parser.spi.source.SupportedFeaturesNamespace;
+import org.opendaylight.yangtools.yang.parser.spi.validation.ValidationBundlesNamespace;
+import org.opendaylight.yangtools.yang.parser.spi.validation.ValidationBundlesNamespace.ValidationBundleType;
 import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor;
 
 /**
@@ -17,19 +162,180 @@ import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementR
  */
 @Beta
 public final class RFC7950Reactors {
-    private static final CrossSourceStatementReactor DEFAULT_RFC6020_RFC7950_REACTOR =
-            YangInferencePipeline.newReactorBuilder().build();
-    // FIXME: this is incorrect, as it includes semver support.
-    private static final CrossSourceStatementReactor VANILLA_RFC6020_RFC7950_REACTOR =
-            YangInferencePipeline.newReactorBuilder().build();
+    private static final Set<YangVersion> SUPPORTED_VERSIONS = Sets.immutableEnumSet(VERSION_1, VERSION_1_1);
+
+    private static final StatementSupportBundle INIT_BUNDLE = StatementSupportBundle.builder(SUPPORTED_VERSIONS)
+            .addSupport(global(ValidationBundlesNamespace.class))
+            .addSupport(global(SupportedFeaturesNamespace.class))
+            .addSupport(global(ModulesDeviatedByModules.class))
+            .build();
+
+    private static final StatementSupportBundle PRE_LINKAGE_BUNDLE = StatementSupportBundle.derivedFrom(INIT_BUNDLE)
+            .addVersionSpecificSupport(VERSION_1, new ModuleStatementRFC6020Support())
+            .addVersionSpecificSupport(VERSION_1_1, new ModuleStatementRFC7950Support())
+            .addVersionSpecificSupport(VERSION_1, new SubmoduleStatementRFC6020Support())
+            .addVersionSpecificSupport(VERSION_1_1, new SubmoduleStatementRFC7950Support())
+            .addSupport(new NamespaceStatementSupport())
+            .addVersionSpecificSupport(VERSION_1, new ImportStatementRFC6020Support())
+            .addVersionSpecificSupport(VERSION_1_1, new ImportStatementRFC7950Support())
+            .addVersionSpecificSupport(VERSION_1, new IncludeStatementRFC6020Support())
+            .addVersionSpecificSupport(VERSION_1_1, new IncludeStatementRFC7950Support())
+            .addSupport(new BelongsToStatementSupport())
+            .addSupport(new PrefixStatementSupport())
+            .addSupport(new YangVersionStatementSupport())
+            .addSupport(new RevisionStatementSupport())
+            .addSupport(new RevisionDateStatementSupport())
+            .addSupport(global(ModuleNameToNamespace.class))
+            .addSupport(global(PreLinkageModuleNamespace.class))
+            .addSupport(sourceLocal(ImpPrefixToNamespace.class))
+            .addSupport(global(ModuleCtxToModuleQName.class))
+            .build();
+
+    private static final StatementSupportBundle LINKAGE_BUNDLE = StatementSupportBundle
+            .derivedFrom(PRE_LINKAGE_BUNDLE)
+            .addSupport(new DescriptionStatementSupport())
+            .addSupport(new ReferenceStatementSupport())
+            .addSupport(new ContactStatementSupport())
+            .addSupport(new OrganizationStatementSupport())
+            .addSupport(global(ModuleNamespace.class))
+            .addSupport(global(ModuleNamespaceForBelongsTo.class))
+            .addSupport(global(SubmoduleNamespace.class))
+            .addSupport(global(NamespaceToModule.class))
+            .addSupport(global(ModuleNameToModuleQName.class))
+            .addSupport(global(ModuleCtxToSourceIdentifier.class))
+            .addSupport(global(ModuleQNameToModuleName.class))
+            .addSupport(global(PrefixToModule.class))
+            .addSupport(QNameCacheNamespace.getInstance())
+            .addSupport(sourceLocal(ImportedModuleContext.class))
+            .addSupport(sourceLocal(IncludedModuleContext.class))
+            .addSupport(sourceLocal(IncludedSubmoduleNameToModuleCtx.class))
+            .addSupport(sourceLocal(ImportPrefixToModuleCtx.class))
+            .addSupport(sourceLocal(BelongsToPrefixToModuleCtx.class))
+            .addSupport(sourceLocal(URIStringToImportPrefix.class))
+            .addSupport(sourceLocal(BelongsToModuleContext.class))
+            .addSupport(sourceLocal(QNameToStatementDefinition.class))
+            .addSupport(sourceLocal(BelongsToPrefixToModuleName.class))
+            .build();
+
+    private static final StatementSupportBundle STMT_DEF_BUNDLE = StatementSupportBundle
+            .derivedFrom(LINKAGE_BUNDLE)
+            .addSupport(new YinElementStatementSupport())
+            .addSupport(new ArgumentStatementSupport())
+            .addSupport(new ExtensionStatementSupport())
+            .addSupport(new ChildSchemaNodeNamespace<>())
+            .addSupport(new SchemaNodeIdentifierBuildNamespace())
+            .addSupport(global(ExtensionNamespace.class))
+            .addSupport(new TypedefStatementSupport())
+            .addSupport(treeScoped(TypeNamespace.class))
+            .addVersionSpecificSupport(VERSION_1, new IdentityStatementRFC6020Support())
+            .addVersionSpecificSupport(VERSION_1_1, new IdentityStatementRFC7950Support())
+            .addSupport(global(IdentityNamespace.class))
+            .addSupport(new DefaultStatementSupport())
+            .addSupport(new StatusStatementSupport())
+            .addVersionSpecificSupport(VERSION_1, new TypeStatementRFC6020Support())
+            .addVersionSpecificSupport(VERSION_1_1, new TypeStatementRFC7950Support())
+            .addSupport(new UnitsStatementSupport())
+            .addSupport(new RequireInstanceStatementSupport())
+            .addVersionSpecificSupport(VERSION_1, new BitStatementRFC6020Support())
+            .addVersionSpecificSupport(VERSION_1_1, new BitStatementRFC7950Support())
+            .addSupport(new PathStatementSupport())
+            .addVersionSpecificSupport(VERSION_1, new EnumStatementRFC6020Support())
+            .addVersionSpecificSupport(VERSION_1_1, new EnumStatementRFC7950Support())
+            .addSupport(new LengthStatementSupport())
+            .addVersionSpecificSupport(VERSION_1, new PatternStatementRFC6020Support())
+            .addVersionSpecificSupport(VERSION_1_1, new PatternStatementRFC7950Support())
+            .addVersionSpecificSupport(VERSION_1_1, new ModifierStatementSupport())
+            .addSupport(new RangeStatementSupport())
+            .addSupport(new KeyStatementSupport())
+            .addVersionSpecificSupport(VERSION_1, new ContainerStatementRFC6020Support())
+            .addVersionSpecificSupport(VERSION_1_1, new ContainerStatementRFC7950Support())
+            .addVersionSpecificSupport(VERSION_1, new GroupingStatementRFC6020Support())
+            .addVersionSpecificSupport(VERSION_1_1, new GroupingStatementRFC7950Support())
+            .addVersionSpecificSupport(VERSION_1, new ListStatementRFC6020Support())
+            .addVersionSpecificSupport(VERSION_1_1, new ListStatementRFC7950Support())
+            .addSupport(new UniqueStatementSupport())
+            .addVersionSpecificSupport(VERSION_1_1, new ActionStatementSupport())
+            .addVersionSpecificSupport(VERSION_1, new RpcStatementRFC6020Support())
+            .addVersionSpecificSupport(VERSION_1_1, new RpcStatementRFC7950Support())
+            .addVersionSpecificSupport(VERSION_1, new InputStatementRFC6020Support())
+            .addVersionSpecificSupport(VERSION_1_1, new InputStatementRFC7950Support())
+            .addVersionSpecificSupport(VERSION_1, new OutputStatementRFC6020Support())
+            .addVersionSpecificSupport(VERSION_1_1, new OutputStatementRFC7950Support())
+            .addVersionSpecificSupport(VERSION_1, new NotificationStatementRFC6020Support())
+            .addVersionSpecificSupport(VERSION_1_1, new NotificationStatementRFC7950Support())
+            .addSupport(new FractionDigitsStatementSupport())
+            .addSupport(new BaseStatementSupport())
+            .addSupport(global(DerivedIdentitiesNamespace.class))
+            .addSupport(global(StatementDefinitionNamespace.class))
+            .build();
+
+    private static final StatementSupportBundle FULL_DECL_BUNDLE = StatementSupportBundle
+            .derivedFrom(STMT_DEF_BUNDLE)
+            .addSupport(new LeafStatementSupport())
+            .addSupport(new ConfigStatementSupport())
+            .addSupport(new DeviationStatementSupport())
+            .addVersionSpecificSupport(VERSION_1, new DeviateStatementRFC6020Support())
+            .addVersionSpecificSupport(VERSION_1_1, new DeviateStatementRFC7950Support())
+            .addVersionSpecificSupport(VERSION_1, new ChoiceStatementRFC6020Support())
+            .addVersionSpecificSupport(VERSION_1_1, new ChoiceStatementRFC7950Support())
+            .addVersionSpecificSupport(VERSION_1, new CaseStatementRFC6020Support())
+            .addVersionSpecificSupport(VERSION_1_1, new CaseStatementRFC7950Support())
+            .addSupport(new MustStatementSupport())
+            .addSupport(new MandatoryStatementSupport())
+            .addSupport(new AnyxmlStatementSupport())
+            .addVersionSpecificSupport(VERSION_1_1, new AnydataStatementSupport())
+            .addSupport(new IfFeatureStatementSupport())
+            .addSupport(new UsesStatementSupport())
+            .addSupport(treeScoped(GroupingNamespace.class)) //treeScoped
+            .addSupport(new ErrorMessageStatementSupport())
+            .addSupport(new ErrorAppTagStatementSupport())
+            .addVersionSpecificSupport(VERSION_1, new LeafListStatementRFC6020Support())
+            .addVersionSpecificSupport(VERSION_1_1, new LeafListStatementRFC7950Support())
+            .addSupport(new PresenceStatementSupport())
+            .addSupport(new MaxElementsStatementSupport())
+            .addSupport(new MinElementsStatementSupport())
+            .addSupport(new OrderedByStatementSupport())
+            .addSupport(new WhenStatementSupport())
+            .addVersionSpecificSupport(VERSION_1, new AugmentStatementRFC6020Support())
+            .addVersionSpecificSupport(VERSION_1_1, new AugmentStatementRFC7950Support())
+            .addSupport(treeScoped(AugmentToChoiceNamespace.class))
+            .addVersionSpecificSupport(VERSION_1, new RefineStatementRFC6020Support())
+            .addVersionSpecificSupport(VERSION_1_1, new RefineStatementRFC7950Support())
+            .addSupport(new FeatureStatementSupport())
+            .addSupport(new PositionStatementSupport())
+            .addSupport(new ValueStatementSupport())
+            .addSupport(global(StmtOrderingNamespace.class))
+            .build();
+
+    private static final Map<ModelProcessingPhase, StatementSupportBundle> RFC7950_BUNDLES =
+            ImmutableMap.<ModelProcessingPhase, StatementSupportBundle>builder()
+            .put(ModelProcessingPhase.INIT, INIT_BUNDLE)
+            .put(ModelProcessingPhase.SOURCE_PRE_LINKAGE, PRE_LINKAGE_BUNDLE)
+            .put(ModelProcessingPhase.SOURCE_LINKAGE, LINKAGE_BUNDLE)
+            .put(ModelProcessingPhase.STATEMENT_DEFINITION, STMT_DEF_BUNDLE)
+            .put(ModelProcessingPhase.FULL_DECLARATION, FULL_DECL_BUNDLE)
+            .put(ModelProcessingPhase.EFFECTIVE_MODEL, FULL_DECL_BUNDLE)
+            .build();
+
+    private static final Map<ValidationBundleType, Collection<StatementDefinition>> RFC6020_VALIDATION_BUNDLE =
+            ImmutableMap.<ValidationBundleType, Collection<StatementDefinition>>builder()
+            .put(ValidationBundleType.SUPPORTED_REFINE_SUBSTATEMENTS,
+                YangValidationBundles.SUPPORTED_REFINE_SUBSTATEMENTS)
+            .put(ValidationBundleType.SUPPORTED_AUGMENT_TARGETS, YangValidationBundles.SUPPORTED_AUGMENT_TARGETS)
+            .put(ValidationBundleType.SUPPORTED_CASE_SHORTHANDS, YangValidationBundles.SUPPORTED_CASE_SHORTHANDS)
+            .put(ValidationBundleType.SUPPORTED_DATA_NODES, YangValidationBundles.SUPPORTED_DATA_NODES)
+            .build();
+
+    private static final CrossSourceStatementReactor DEFAULT_RFC6020_RFC7950_REACTOR = defaultReactorBuilder().build();
+    private static final CrossSourceStatementReactor VANILLA_RFC6020_RFC7950_REACTOR = vanillaReactorBuilder().build();
 
     private RFC7950Reactors() {
         throw new UnsupportedOperationException();
     }
 
     /**
-     * Returns a pre-built {@link CrossSourceStatementReactor} supporting RFC6020 and RFC7950, along with OpenConfig's
-     * semantic-version extension. This is useful for parsing near-vanilla YANG models while providing complete
+     * Returns a pre-built {@link CrossSourceStatementReactor} supporting RFC6020 and RFC7950, along with OpenConfig
+     * semantic version extension. This is useful for parsing near-vanilla YANG models while providing complete
      * support for semantic versions.
      *
      * @return A shared reactor instance.
@@ -38,6 +344,22 @@ public final class RFC7950Reactors {
         return DEFAULT_RFC6020_RFC7950_REACTOR;
     }
 
+    /**
+     * Returns a partially-configured {@link CustomCrossSourceStatementReactorBuilder}, with RFC6020/RFC7950
+     * and OpenConfig semantic version support enabled.
+     *
+     * @return A new {@link CustomCrossSourceStatementReactorBuilder}.
+     */
+    public static CustomCrossSourceStatementReactorBuilder defaultReactorBuilder() {
+        return vanillaReactorBuilder()
+                // Semantic version support
+                .addStatementSupport(ModelProcessingPhase.SOURCE_LINKAGE, OpenConfigVersionSupport.getInstance())
+                .addNamespaceSupport(ModelProcessingPhase.SOURCE_LINKAGE, global(SemanticVersionNamespace.class))
+                .addNamespaceSupport(ModelProcessingPhase.SOURCE_LINKAGE, global(SemanticVersionModuleNamespace.class))
+                .addNamespaceSupport(ModelProcessingPhase.SOURCE_LINKAGE,
+                    sourceLocal(ImportPrefixToSemVerSourceIdentifier.class));
+    }
+
     /**
      * Returns a pre-built {@link CrossSourceStatementReactor} supporting both RFC6020 and RFC7950. This is useful
      * for parsing vanilla YANG models without any semantic support for extensions. Notably missing is the semantic
@@ -48,4 +370,22 @@ public final class RFC7950Reactors {
     public static CrossSourceStatementReactor vanillaReactor() {
         return VANILLA_RFC6020_RFC7950_REACTOR;
     }
+
+    /**
+     * Returns a partially-configured {@link CustomCrossSourceStatementReactorBuilder}, with vanilla RFC6020/RFC7950
+     * support enabled.
+     *
+     * @return A new {@link CustomCrossSourceStatementReactorBuilder}.
+     */
+    public static CustomCrossSourceStatementReactorBuilder vanillaReactorBuilder() {
+        return addDefaultRFC7950Bundles(new CustomCrossSourceStatementReactorBuilder(SUPPORTED_VERSIONS));
+    }
+
+    private static CustomCrossSourceStatementReactorBuilder addDefaultRFC7950Bundles(
+            final CustomCrossSourceStatementReactorBuilder builder) {
+        RFC7950_BUNDLES.entrySet().forEach(entry -> builder.addAllSupports(entry.getKey(), entry.getValue()));
+        RFC6020_VALIDATION_BUNDLE.entrySet().forEach(
+            entry -> builder.addValidationBundle(entry.getKey(), entry.getValue()));
+        return builder;
+    }
 }

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/YangInferencePipeline.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/YangInferencePipeline.java
deleted file mode 100644 (file)
index d2dbc8e..0000000
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/YangInferencePipeline.java
+++ /dev/null
@@ -1,357 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.yangtools.yang.parser.rfc7950.reactor;
-
-import static org.opendaylight.yangtools.yang.common.YangVersion.VERSION_1;
-import static org.opendaylight.yangtools.yang.common.YangVersion.VERSION_1_1;
-import static org.opendaylight.yangtools.yang.parser.spi.meta.NamespaceBehaviour.global;
-import static org.opendaylight.yangtools.yang.parser.spi.meta.NamespaceBehaviour.sourceLocal;
-import static org.opendaylight.yangtools.yang.parser.spi.meta.NamespaceBehaviour.treeScoped;
-
-import com.google.common.annotations.Beta;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Sets;
-import java.util.Collection;
-import java.util.Map;
-import java.util.Set;
-import org.opendaylight.yangtools.yang.common.YangVersion;
-import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
-import org.opendaylight.yangtools.yang.parser.odlext.namespace.AnyxmlSchemaLocationNamespace;
-import org.opendaylight.yangtools.yang.parser.odlext.stmt.AnyxmlSchemaLocationSupport;
-import org.opendaylight.yangtools.yang.parser.openconfig.stmt.OpenConfigVersionSupport;
-import org.opendaylight.yangtools.yang.parser.rfc7950.namespace.ChildSchemaNodeNamespace;
-import org.opendaylight.yangtools.yang.parser.rfc7950.namespace.SchemaNodeIdentifierBuildNamespace;
-import org.opendaylight.yangtools.yang.parser.rfc7950.namespace.URIStringToImportPrefix;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.action.ActionStatementSupport;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.anydata.AnydataStatementSupport;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.anyxml.AnyxmlStatementSupport;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.argument.ArgumentStatementSupport;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.augment.AugmentStatementRFC6020Support;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.augment.AugmentStatementRFC7950Support;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.base.BaseStatementSupport;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.belongs_to.BelongsToStatementSupport;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.bit.BitStatementRFC6020Support;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.bit.BitStatementRFC7950Support;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.case_.CaseStatementRFC6020Support;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.case_.CaseStatementRFC7950Support;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.choice.ChoiceStatementRFC6020Support;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.choice.ChoiceStatementRFC7950Support;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.config.ConfigStatementSupport;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.contact.ContactStatementSupport;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.container.ContainerStatementRFC6020Support;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.container.ContainerStatementRFC7950Support;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.default_.DefaultStatementSupport;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.description.DescriptionStatementSupport;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.deviate.DeviateStatementRFC6020Support;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.deviate.DeviateStatementRFC7950Support;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.deviation.DeviationStatementSupport;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.enum_.EnumStatementRFC6020Support;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.enum_.EnumStatementRFC7950Support;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.error_app_tag.ErrorAppTagStatementSupport;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.error_message.ErrorMessageStatementSupport;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.extension.ExtensionStatementSupport;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.feature.FeatureStatementSupport;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.fraction_digits.FractionDigitsStatementSupport;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.grouping.GroupingStatementRFC6020Support;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.grouping.GroupingStatementRFC7950Support;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.identity.IdentityStatementRFC6020Support;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.identity.IdentityStatementRFC7950Support;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.if_feature.IfFeatureStatementSupport;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.import_.ImportStatementRFC6020Support;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.import_.ImportStatementRFC7950Support;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.include.IncludeStatementRFC6020Support;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.include.IncludeStatementRFC7950Support;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.input.InputStatementRFC6020Support;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.input.InputStatementRFC7950Support;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.key.KeyStatementSupport;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.leaf.LeafStatementSupport;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.leaf_list.LeafListStatementRFC6020Support;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.leaf_list.LeafListStatementRFC7950Support;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.length.LengthStatementSupport;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.list.ListStatementRFC6020Support;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.list.ListStatementRFC7950Support;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.mandatory.MandatoryStatementSupport;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.max_elements.MaxElementsStatementSupport;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.min_elements.MinElementsStatementSupport;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.modifier.ModifierStatementSupport;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.module.ModuleStatementRFC6020Support;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.module.ModuleStatementRFC7950Support;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.must.MustStatementSupport;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.namespace.NamespaceStatementSupport;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.notification.NotificationStatementRFC6020Support;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.notification.NotificationStatementRFC7950Support;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.ordered_by.OrderedByStatementSupport;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.organization.OrganizationStatementSupport;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.output.OutputStatementRFC6020Support;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.output.OutputStatementRFC7950Support;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.path.PathStatementSupport;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.pattern.PatternStatementRFC6020Support;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.pattern.PatternStatementRFC7950Support;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.position.PositionStatementSupport;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.prefix.PrefixStatementSupport;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.presence.PresenceStatementSupport;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.range.RangeStatementSupport;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.reference.ReferenceStatementSupport;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.refine.RefineStatementRFC6020Support;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.refine.RefineStatementRFC7950Support;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.require_instance.RequireInstanceStatementSupport;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.revision.RevisionStatementSupport;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.revision_date.RevisionDateStatementSupport;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.rpc.RpcStatementRFC6020Support;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.rpc.RpcStatementRFC7950Support;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.status.StatusStatementSupport;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.submodule.SubmoduleStatementRFC6020Support;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.submodule.SubmoduleStatementRFC7950Support;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.type.TypeStatementRFC6020Support;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.type.TypeStatementRFC7950Support;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.typedef.TypedefStatementSupport;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.unique.UniqueStatementSupport;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.units.UnitsStatementSupport;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.uses.UsesStatementSupport;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.value.ValueStatementSupport;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.when.WhenStatementSupport;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.yang_version.YangVersionStatementSupport;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.yin_element.YinElementStatementSupport;
-import org.opendaylight.yangtools.yang.parser.spi.ExtensionNamespace;
-import org.opendaylight.yangtools.yang.parser.spi.GroupingNamespace;
-import org.opendaylight.yangtools.yang.parser.spi.IdentityNamespace;
-import org.opendaylight.yangtools.yang.parser.spi.ModuleNamespace;
-import org.opendaylight.yangtools.yang.parser.spi.NamespaceToModule;
-import org.opendaylight.yangtools.yang.parser.spi.PreLinkageModuleNamespace;
-import org.opendaylight.yangtools.yang.parser.spi.SubmoduleNamespace;
-import org.opendaylight.yangtools.yang.parser.spi.TypeNamespace;
-import org.opendaylight.yangtools.yang.parser.spi.meta.DerivedIdentitiesNamespace;
-import org.opendaylight.yangtools.yang.parser.spi.meta.ModelProcessingPhase;
-import org.opendaylight.yangtools.yang.parser.spi.meta.QNameCacheNamespace;
-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.StatementDefinitionNamespace;
-import org.opendaylight.yangtools.yang.parser.spi.meta.StatementSupportBundle;
-import org.opendaylight.yangtools.yang.parser.spi.source.AugmentToChoiceNamespace;
-import org.opendaylight.yangtools.yang.parser.spi.source.BelongsToModuleContext;
-import org.opendaylight.yangtools.yang.parser.spi.source.BelongsToPrefixToModuleCtx;
-import org.opendaylight.yangtools.yang.parser.spi.source.BelongsToPrefixToModuleName;
-import org.opendaylight.yangtools.yang.parser.spi.source.ImpPrefixToNamespace;
-import org.opendaylight.yangtools.yang.parser.spi.source.ImportPrefixToModuleCtx;
-import org.opendaylight.yangtools.yang.parser.spi.source.ImportPrefixToSemVerSourceIdentifier;
-import org.opendaylight.yangtools.yang.parser.spi.source.ImportedModuleContext;
-import org.opendaylight.yangtools.yang.parser.spi.source.IncludedModuleContext;
-import org.opendaylight.yangtools.yang.parser.spi.source.IncludedSubmoduleNameToModuleCtx;
-import org.opendaylight.yangtools.yang.parser.spi.source.ModuleCtxToModuleQName;
-import org.opendaylight.yangtools.yang.parser.spi.source.ModuleCtxToSourceIdentifier;
-import org.opendaylight.yangtools.yang.parser.spi.source.ModuleNameToModuleQName;
-import org.opendaylight.yangtools.yang.parser.spi.source.ModuleNameToNamespace;
-import org.opendaylight.yangtools.yang.parser.spi.source.ModuleNamespaceForBelongsTo;
-import org.opendaylight.yangtools.yang.parser.spi.source.ModuleQNameToModuleName;
-import org.opendaylight.yangtools.yang.parser.spi.source.ModulesDeviatedByModules;
-import org.opendaylight.yangtools.yang.parser.spi.source.PrefixToModule;
-import org.opendaylight.yangtools.yang.parser.spi.source.QNameToStatementDefinition;
-import org.opendaylight.yangtools.yang.parser.spi.source.StmtOrderingNamespace;
-import org.opendaylight.yangtools.yang.parser.spi.source.SupportedFeaturesNamespace;
-import org.opendaylight.yangtools.yang.parser.spi.validation.ValidationBundlesNamespace;
-import org.opendaylight.yangtools.yang.parser.spi.validation.ValidationBundlesNamespace.ValidationBundleType;
-import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor;
-import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor.Builder;
-import org.opendaylight.yangtools.yang.parser.stmt.rfc8040.YangDataStatementSupport;
-
-@Beta
-public final class YangInferencePipeline {
-    public static final Set<YangVersion> SUPPORTED_VERSIONS = Sets.immutableEnumSet(VERSION_1, VERSION_1_1);
-
-    public static final StatementSupportBundle INIT_BUNDLE = StatementSupportBundle
-            .builder(SUPPORTED_VERSIONS).addSupport(global(ValidationBundlesNamespace.class))
-            .addSupport(global(SupportedFeaturesNamespace.class))
-            .addSupport(global(ModulesDeviatedByModules.class))
-            .build();
-
-    public static final StatementSupportBundle PRE_LINKAGE_BUNDLE = StatementSupportBundle
-            .derivedFrom(INIT_BUNDLE)
-            .addVersionSpecificSupport(VERSION_1, new ModuleStatementRFC6020Support())
-            .addVersionSpecificSupport(VERSION_1_1, new ModuleStatementRFC7950Support())
-            .addVersionSpecificSupport(VERSION_1, new SubmoduleStatementRFC6020Support())
-            .addVersionSpecificSupport(VERSION_1_1, new SubmoduleStatementRFC7950Support())
-            .addSupport(new NamespaceStatementSupport())
-            .addVersionSpecificSupport(VERSION_1, new ImportStatementRFC6020Support())
-            .addVersionSpecificSupport(VERSION_1_1, new ImportStatementRFC7950Support())
-            .addVersionSpecificSupport(VERSION_1, new IncludeStatementRFC6020Support())
-            .addVersionSpecificSupport(VERSION_1_1, new IncludeStatementRFC7950Support())
-            .addSupport(new BelongsToStatementSupport())
-            .addSupport(new PrefixStatementSupport())
-            .addSupport(new YangVersionStatementSupport())
-            .addSupport(new RevisionStatementSupport())
-            .addSupport(new RevisionDateStatementSupport())
-            .addSupport(global(ModuleNameToNamespace.class))
-            .addSupport(global(PreLinkageModuleNamespace.class))
-            .addSupport(sourceLocal(ImpPrefixToNamespace.class))
-            .addSupport(global(ModuleCtxToModuleQName.class))
-            .build();
-
-    public static final StatementSupportBundle LINKAGE_BUNDLE = StatementSupportBundle
-            .derivedFrom(PRE_LINKAGE_BUNDLE)
-            .addSupport(new DescriptionStatementSupport())
-            .addSupport(new ReferenceStatementSupport())
-            .addSupport(new ContactStatementSupport())
-            .addSupport(new OrganizationStatementSupport())
-            .addSupport(global(ModuleNamespace.class))
-            .addSupport(global(ModuleNamespaceForBelongsTo.class))
-            .addSupport(global(SubmoduleNamespace.class))
-            .addSupport(global(NamespaceToModule.class))
-            .addSupport(global(ModuleNameToModuleQName.class))
-            .addSupport(global(ModuleCtxToSourceIdentifier.class))
-            .addSupport(global(ModuleQNameToModuleName.class))
-            .addSupport(global(PrefixToModule.class))
-            .addSupport(QNameCacheNamespace.getInstance())
-            .addSupport(sourceLocal(ImportedModuleContext.class))
-            .addSupport(sourceLocal(IncludedModuleContext.class))
-            .addSupport(sourceLocal(IncludedSubmoduleNameToModuleCtx.class))
-            .addSupport(sourceLocal(ImportPrefixToModuleCtx.class))
-            .addSupport(sourceLocal(BelongsToPrefixToModuleCtx.class))
-            .addSupport(sourceLocal(URIStringToImportPrefix.class))
-            .addSupport(sourceLocal(BelongsToModuleContext.class))
-            .addSupport(sourceLocal(QNameToStatementDefinition.class))
-            .addSupport(sourceLocal(BelongsToPrefixToModuleName.class))
-            .addSupport(OpenConfigVersionSupport.getInstance())
-            .addSupport(global(SemanticVersionNamespace.class))
-            .addSupport(global(SemanticVersionModuleNamespace.class))
-            .addSupport(sourceLocal(ImportPrefixToSemVerSourceIdentifier.class))
-            .build();
-
-    public static final StatementSupportBundle STMT_DEF_BUNDLE = StatementSupportBundle
-            .derivedFrom(LINKAGE_BUNDLE)
-            .addSupport(new YinElementStatementSupport())
-            .addSupport(new ArgumentStatementSupport())
-            .addSupport(new ExtensionStatementSupport())
-            .addSupport(new ChildSchemaNodeNamespace<>())
-            .addSupport(new SchemaNodeIdentifierBuildNamespace())
-            .addSupport(global(ExtensionNamespace.class))
-            .addSupport(new TypedefStatementSupport())
-            .addSupport(treeScoped(TypeNamespace.class))
-            .addVersionSpecificSupport(VERSION_1, new IdentityStatementRFC6020Support())
-            .addVersionSpecificSupport(VERSION_1_1, new IdentityStatementRFC7950Support())
-            .addSupport(global(IdentityNamespace.class))
-            .addSupport(new DefaultStatementSupport())
-            .addSupport(new StatusStatementSupport())
-            .addVersionSpecificSupport(VERSION_1, new TypeStatementRFC6020Support())
-            .addVersionSpecificSupport(VERSION_1_1, new TypeStatementRFC7950Support())
-            .addSupport(new UnitsStatementSupport())
-            .addSupport(new RequireInstanceStatementSupport())
-            .addVersionSpecificSupport(VERSION_1, new BitStatementRFC6020Support())
-            .addVersionSpecificSupport(VERSION_1_1, new BitStatementRFC7950Support())
-            .addSupport(new PathStatementSupport())
-            .addVersionSpecificSupport(VERSION_1, new EnumStatementRFC6020Support())
-            .addVersionSpecificSupport(VERSION_1_1, new EnumStatementRFC7950Support())
-            .addSupport(new LengthStatementSupport())
-            .addVersionSpecificSupport(VERSION_1, new PatternStatementRFC6020Support())
-            .addVersionSpecificSupport(VERSION_1_1, new PatternStatementRFC7950Support())
-            .addVersionSpecificSupport(VERSION_1_1, new ModifierStatementSupport())
-            .addSupport(new RangeStatementSupport())
-            .addSupport(new KeyStatementSupport())
-            .addVersionSpecificSupport(VERSION_1, new ContainerStatementRFC6020Support())
-            .addVersionSpecificSupport(VERSION_1_1, new ContainerStatementRFC7950Support())
-            .addVersionSpecificSupport(VERSION_1, new GroupingStatementRFC6020Support())
-            .addVersionSpecificSupport(VERSION_1_1, new GroupingStatementRFC7950Support())
-            .addVersionSpecificSupport(VERSION_1, new ListStatementRFC6020Support())
-            .addVersionSpecificSupport(VERSION_1_1, new ListStatementRFC7950Support())
-            .addSupport(new UniqueStatementSupport())
-            .addVersionSpecificSupport(VERSION_1_1, new ActionStatementSupport())
-            .addVersionSpecificSupport(VERSION_1, new RpcStatementRFC6020Support())
-            .addVersionSpecificSupport(VERSION_1_1, new RpcStatementRFC7950Support())
-            .addVersionSpecificSupport(VERSION_1, new InputStatementRFC6020Support())
-            .addVersionSpecificSupport(VERSION_1_1, new InputStatementRFC7950Support())
-            .addVersionSpecificSupport(VERSION_1, new OutputStatementRFC6020Support())
-            .addVersionSpecificSupport(VERSION_1_1, new OutputStatementRFC7950Support())
-            .addVersionSpecificSupport(VERSION_1, new NotificationStatementRFC6020Support())
-            .addVersionSpecificSupport(VERSION_1_1, new NotificationStatementRFC7950Support())
-            .addSupport(new FractionDigitsStatementSupport())
-            .addSupport(new BaseStatementSupport())
-            .addSupport(global(DerivedIdentitiesNamespace.class))
-            .addSupport(global(StatementDefinitionNamespace.class))
-            .build();
-
-    public static final StatementSupportBundle FULL_DECL_BUNDLE = StatementSupportBundle
-            .derivedFrom(STMT_DEF_BUNDLE)
-            .addSupport(new LeafStatementSupport())
-            .addSupport(new ConfigStatementSupport())
-            .addSupport(new DeviationStatementSupport())
-            .addVersionSpecificSupport(VERSION_1, new DeviateStatementRFC6020Support())
-            .addVersionSpecificSupport(VERSION_1_1, new DeviateStatementRFC7950Support())
-            .addVersionSpecificSupport(VERSION_1, new ChoiceStatementRFC6020Support())
-            .addVersionSpecificSupport(VERSION_1_1, new ChoiceStatementRFC7950Support())
-            .addVersionSpecificSupport(VERSION_1, new CaseStatementRFC6020Support())
-            .addVersionSpecificSupport(VERSION_1_1, new CaseStatementRFC7950Support())
-            .addSupport(new MustStatementSupport())
-            .addSupport(new MandatoryStatementSupport())
-            .addSupport(new AnyxmlStatementSupport())
-            .addVersionSpecificSupport(VERSION_1_1, new AnydataStatementSupport())
-            .addSupport(new IfFeatureStatementSupport())
-            .addSupport(new UsesStatementSupport())
-            .addSupport(treeScoped(GroupingNamespace.class)) //treeScoped
-            .addSupport(new ErrorMessageStatementSupport())
-            .addSupport(new ErrorAppTagStatementSupport())
-            .addVersionSpecificSupport(VERSION_1, new LeafListStatementRFC6020Support())
-            .addVersionSpecificSupport(VERSION_1_1, new LeafListStatementRFC7950Support())
-            .addSupport(new PresenceStatementSupport())
-            .addSupport(new MaxElementsStatementSupport())
-            .addSupport(new MinElementsStatementSupport())
-            .addSupport(new OrderedByStatementSupport())
-            .addSupport(new WhenStatementSupport())
-            .addVersionSpecificSupport(VERSION_1, new AugmentStatementRFC6020Support())
-            .addVersionSpecificSupport(VERSION_1_1, new AugmentStatementRFC7950Support())
-            .addSupport(treeScoped(AugmentToChoiceNamespace.class))
-            .addVersionSpecificSupport(VERSION_1, new RefineStatementRFC6020Support())
-            .addVersionSpecificSupport(VERSION_1_1, new RefineStatementRFC7950Support())
-            .addSupport(new FeatureStatementSupport())
-            .addSupport(new PositionStatementSupport())
-            .addSupport(new ValueStatementSupport())
-            .addSupport(AnyxmlSchemaLocationSupport.getInstance())
-            .addSupport(treeScoped(AnyxmlSchemaLocationNamespace.class))
-            .addSupport(YangDataStatementSupport.getInstance())
-            .addSupport(global(StmtOrderingNamespace.class))
-            .build();
-
-    public static final Map<ModelProcessingPhase, StatementSupportBundle> RFC6020_BUNDLES =
-            ImmutableMap.<ModelProcessingPhase, StatementSupportBundle>builder()
-            .put(ModelProcessingPhase.INIT, INIT_BUNDLE)
-            .put(ModelProcessingPhase.SOURCE_PRE_LINKAGE, PRE_LINKAGE_BUNDLE)
-            .put(ModelProcessingPhase.SOURCE_LINKAGE, LINKAGE_BUNDLE)
-            .put(ModelProcessingPhase.STATEMENT_DEFINITION, STMT_DEF_BUNDLE)
-            .put(ModelProcessingPhase.FULL_DECLARATION, FULL_DECL_BUNDLE)
-            .put(ModelProcessingPhase.EFFECTIVE_MODEL, FULL_DECL_BUNDLE)
-            .build();
-
-    public static final Map<ValidationBundleType, Collection<StatementDefinition>> RFC6020_VALIDATION_BUNDLE =
-            ImmutableMap.<ValidationBundleType, Collection<StatementDefinition>>builder()
-            .put(ValidationBundleType.SUPPORTED_REFINE_SUBSTATEMENTS,
-                YangValidationBundles.SUPPORTED_REFINE_SUBSTATEMENTS)
-            .put(ValidationBundleType.SUPPORTED_AUGMENT_TARGETS, YangValidationBundles.SUPPORTED_AUGMENT_TARGETS)
-            .put(ValidationBundleType.SUPPORTED_CASE_SHORTHANDS, YangValidationBundles.SUPPORTED_CASE_SHORTHANDS)
-            .put(ValidationBundleType.SUPPORTED_DATA_NODES, YangValidationBundles.SUPPORTED_DATA_NODES)
-            .build();
-
-    public static Builder newReactorBuilder() {
-        return CrossSourceStatementReactor.builder()
-                .setBundle(ModelProcessingPhase.INIT, INIT_BUNDLE)
-                .setBundle(ModelProcessingPhase.SOURCE_PRE_LINKAGE, PRE_LINKAGE_BUNDLE)
-                .setBundle(ModelProcessingPhase.SOURCE_LINKAGE, LINKAGE_BUNDLE)
-                .setBundle(ModelProcessingPhase.STATEMENT_DEFINITION, STMT_DEF_BUNDLE)
-                .setBundle(ModelProcessingPhase.FULL_DECLARATION, FULL_DECL_BUNDLE)
-                .setBundle(ModelProcessingPhase.EFFECTIVE_MODEL, FULL_DECL_BUNDLE)
-                .setValidationBundle(ValidationBundleType.SUPPORTED_REFINE_SUBSTATEMENTS,
-                    YangValidationBundles.SUPPORTED_REFINE_SUBSTATEMENTS)
-                .setValidationBundle(ValidationBundleType.SUPPORTED_AUGMENT_TARGETS,
-                    YangValidationBundles.SUPPORTED_AUGMENT_TARGETS)
-                .setValidationBundle(ValidationBundleType.SUPPORTED_CASE_SHORTHANDS,
-                    YangValidationBundles.SUPPORTED_CASE_SHORTHANDS)
-                .setValidationBundle(ValidationBundleType.SUPPORTED_DATA_NODES,
-                    YangValidationBundles.SUPPORTED_DATA_NODES);
-    }
-
-    private YangInferencePipeline() {
-        throw new UnsupportedOperationException("Utility class");
-    }
-}

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/CustomInferencePipeline.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/CustomInferencePipeline.java
index d51052ee3d9a259ad207eae39f8eabf1105cb629..7b02c6020f34e22e05c0981e38965096965998e6 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/CustomInferencePipeline.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/CustomInferencePipeline.java
@@ -9,13 +9,12 @@ package org.opendaylight.yangtools.yang.thirdparty.plugin;
 
 import static org.opendaylight.yangtools.yang.parser.spi.meta.NamespaceBehaviour.sourceLocal;
 
-import org.opendaylight.yangtools.yang.parser.rfc7950.reactor.CustomStatementParserBuilder;
+import org.opendaylight.yangtools.yang.parser.rfc7950.reactor.RFC7950Reactors;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ModelProcessingPhase;
 import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor;
 
 public final class CustomInferencePipeline {
-    public static final CrossSourceStatementReactor CUSTOM_REACTOR = new CustomStatementParserBuilder()
-            .addDefaultRFC6020Bundles()
+    public static final CrossSourceStatementReactor CUSTOM_REACTOR = RFC7950Reactors.defaultReactorBuilder()
             .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, ThirdPartyExtensionSupport.getInstance())
             .addNamespaceSupport(ModelProcessingPhase.FULL_DECLARATION, sourceLocal(ThirdPartyNamespace.class))
             .build();