Bug 2366 - Effective statments impl merge, retest & bugfix

[yangtools.git] / yang / yang-parser-impl / src / main / java / org / opendaylight / yangtools / yang / parser / stmt / reactor / BuildGlobalContext.java

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/BuildGlobalContext.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/BuildGlobalContext.java
index ad6d70a823c9060d454394b2460d8cc43ce4f2b3..b4c7bdd204ade5adb2ec122c33f56e956dd168b8 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/BuildGlobalContext.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/BuildGlobalContext.java
@@ -7,8 +7,13 @@
  */
 package org.opendaylight.yangtools.yang.parser.stmt.reactor;
 
-import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.EffectiveSchemaContext;
+import org.opendaylight.yangtools.yang.parser.spi.meta.ModelActionBuilder.Prerequisite;
+import org.opendaylight.yangtools.yang.parser.spi.validation.ValidationBundlesNamespace;
 
+import java.util.Map.Entry;
+import java.util.Collection;
+import org.opendaylight.yangtools.yang.parser.spi.validation.ValidationBundlesNamespace.ValidationBundleType;
+import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.EffectiveSchemaContext;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Throwables;
@@ -49,18 +54,28 @@ class BuildGlobalContext extends NamespaceStorageSupport implements NamespaceBeh
             .build();
 
     private final Map<QName,StatementDefinitionContext<?,?,?>> definitions = new HashMap<>();
-    private final Map<Class<?>,NamespaceBehaviourWithListeners<?, ?, ?>> namespaces = new HashMap<>();
+    private final Map<Class<?>,NamespaceBehaviourWithListeners<?, ?, ?>> supportedNamespaces = new HashMap<>();
 
 
     private final Map<ModelProcessingPhase,StatementSupportBundle> supports;
     private final Set<SourceSpecificContext> sources = new HashSet<>();
 
-    private ModelProcessingPhase currentPhase;
-    private ModelProcessingPhase finishedPhase;
+    private ModelProcessingPhase currentPhase = ModelProcessingPhase.INIT;
+    private ModelProcessingPhase finishedPhase = ModelProcessingPhase.INIT;
 
     public BuildGlobalContext(Map<ModelProcessingPhase, StatementSupportBundle> supports) {
         super();
-        this.supports = supports;
+        this.supports = Preconditions.checkNotNull(supports, "BuildGlobalContext#supports cannot be null");
+    }
+
+    public BuildGlobalContext(Map<ModelProcessingPhase, StatementSupportBundle> supports,  Map<ValidationBundleType,Collection<?>> supportedValidation) {
+        super();
+        this.supports = Preconditions.checkNotNull(supports, "BuildGlobalContext#supports cannot be null");
+
+        Set<Entry<ValidationBundleType, Collection<?>>> validationBundles = supportedValidation.entrySet();
+        for (Entry<ValidationBundleType, Collection<?>> validationBundle : validationBundles) {
+            addToNs(ValidationBundlesNamespace.class, validationBundle.getKey(), validationBundle.getValue());
+        }
     }
 
     public StatementSupportBundle getSupportsForPhase(ModelProcessingPhase currentPhase) {
@@ -88,12 +103,12 @@ class BuildGlobalContext extends NamespaceStorageSupport implements NamespaceBeh
 
     @Override
     public <K, V, N extends IdentifierNamespace<K, V>> NamespaceBehaviourWithListeners<K, V, N> getNamespaceBehaviour(Class<N> type) {
-        NamespaceBehaviourWithListeners<?, ?, ?> potential = namespaces.get(type);
+        NamespaceBehaviourWithListeners<?, ?, ?> potential = supportedNamespaces.get(type);
         if (potential == null) {
             NamespaceBehaviour<K, V, N> potentialRaw = supports.get(currentPhase).getNamespaceBehaviour(type);
             if(potentialRaw != null) {
                 potential = new NamespaceBehaviourWithListeners<>(potentialRaw);
-                namespaces.put(type, potential);
+                supportedNamespaces.put(type, potential);
             }
         }
         if (potential != null) {
@@ -105,7 +120,7 @@ class BuildGlobalContext extends NamespaceStorageSupport implements NamespaceBeh
              */
             return (NamespaceBehaviourWithListeners<K, V, N>) potential;
         }
-        throw new NamespaceNotAvailableException("Namespace " + type + "is not available in phase " + currentPhase);
+        throw new NamespaceNotAvailableException("Namespace " + type + " is not available in phase " + currentPhase);
     }
 
     public StatementDefinitionContext<?, ?, ?> getStatementDefinition(QName name) {
@@ -191,14 +206,20 @@ class BuildGlobalContext extends NamespaceStorageSupport implements NamespaceBeh
                 progressing = false;
                 Iterator<SourceSpecificContext> currentSource = sourcesToProgress.iterator();
                 while(currentSource.hasNext()) {
-                    PhaseCompletionProgress sourceProgress = currentSource.next().tryToCompletePhase(currentPhase);
+                    SourceSpecificContext nextSourceCtx = currentSource.next();
+                    PhaseCompletionProgress sourceProgress = nextSourceCtx.tryToCompletePhase(currentPhase);
                     switch (sourceProgress) {
                         case FINISHED:
                             currentSource.remove();
+                            // Fallback to progress, since we were able to make progress in computation
                         case PROGRESS:
                             progressing = true;
+                            break;
                         case NO_PROGRESS:
-                            // Noop;
+                            // Noop
+                            break;
+                        default:
+                           throw new IllegalStateException("Unsupported phase progress " + sourceProgress);
                     }
                 }
             }