import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Objects;
-import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import org.opendaylight.yangtools.concepts.Mutable;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.common.QNameModule;
-import org.opendaylight.yangtools.yang.common.YangConstants;
+import org.opendaylight.yangtools.yang.model.api.ModuleIdentifier;
import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
import org.opendaylight.yangtools.yang.model.api.meta.IdentifierNamespace;
import org.opendaylight.yangtools.yang.parser.spi.meta.NamespaceBehaviour;
import org.opendaylight.yangtools.yang.parser.spi.meta.NamespaceBehaviour.NamespaceStorageNode;
import org.opendaylight.yangtools.yang.parser.spi.meta.NamespaceBehaviour.StorageNodeType;
+import org.opendaylight.yangtools.yang.parser.spi.meta.QNameCacheNamespace;
import org.opendaylight.yangtools.yang.parser.spi.meta.StatementSupport;
import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
+import org.opendaylight.yangtools.yang.parser.spi.source.BelongsToPrefixToModuleIdentifier;
+import org.opendaylight.yangtools.yang.parser.spi.source.ImpPrefixToModuleIdentifier;
+import org.opendaylight.yangtools.yang.parser.spi.source.ModuleIdentifierToModuleQName;
import org.opendaylight.yangtools.yang.parser.spi.source.PrefixToModule;
import org.opendaylight.yangtools.yang.parser.spi.source.PrefixToModuleMap;
import org.opendaylight.yangtools.yang.parser.spi.source.QNameToStatementDefinition;
import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.UnionSpecificationImpl;
import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.UnknownStatementImpl;
import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.Utils;
-import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.UnknownEffectiveStatementImpl;
public class SourceSpecificContext implements NamespaceStorageNode, NamespaceBehaviour.Registry, Mutable {
if (def == null) {
//unknown-stmts (from import, include or local-scope)
- if (qNameToStmtDefMap.get(Utils.trimPrefix(name)) != null) {
- QName key = Utils.qNameFromArgument(current, name.getLocalName());
- if (key != null) {
- final StatementContextBase<?,?,?> extension = (StatementContextBase<?, ?, ?>) currentContext
- .getAllFromNamespace(ExtensionNamespace.class).get(key);
- if (extension != null) {
- final QName qName = QName.create(((QName) ((SubstatementContext<?, ?, ?>) extension).getStatementArgument())
- .getModule().getNamespace(), ((QName) ((SubstatementContext<?, ?, ?>) extension).
- getStatementArgument()).getModule().getRevision(), extension.getIdentifier().getArgument());
-
- def = new StatementDefinitionContext<>(new UnknownStatementImpl.Definition
- (getNewStatementDefinition(qName)));
- } else {
- throw new IllegalArgumentException("Not found unknown statement: " + name);
- }
+ if (qNameToStmtDefMap.get(name) != null) {
+ final StatementContextBase<?, ?, ?> extension = (StatementContextBase<?, ?, ?>) currentContext
+ .getAllFromNamespace(ExtensionNamespace.class).get(name);
+ if (extension != null) {
+ final QName arg = (QName) extension.getStatementArgument();
+ final QName qName = current.getFromNamespace(QNameCacheNamespace.class,
+ QName.create(arg, extension.getIdentifier().getArgument()));
+
+ def = new StatementDefinitionContext<>(new UnknownStatementImpl.Definition(
+ getNewStatementDefinition(qName)));
+ } else {
+ throw new IllegalArgumentException("Not found unknown statement: " + name);
}
} else {
- //type-body-stmts
+ // type-body-stmts
def = resolveTypeBodyStmts(name.getLocalName());
}
}
return current.substatementBuilder(def, ref);
}
+ // FIXME: This should be populated differently
StatementDefinition getNewStatementDefinition(final QName qName) {
- return new StatementDefinition() {
- @Nonnull
- @Override
- public QName getStatementName() {
- return qName;
- }
-
- @Nullable
- @Override
- public QName getArgumentName() {
- return qName;
- }
-
- @Nonnull
- @Override
- public Class<? extends DeclaredStatement<?>> getDeclaredRepresentationClass() {
- return UnknownStatementImpl.class;
- }
-
- @Nonnull
- @Override
- public Class<? extends EffectiveStatement<?, ?>> getEffectiveRepresentationClass() {
- return UnknownEffectiveStatementImpl.class;
- }
- };
+ return new ModelDefinedStatementDefinition(qName);
}
@SuppressWarnings({"rawtypes", "unchecked"})
PhaseCompletionProgress tryToCompletePhase(final ModelProcessingPhase phase) throws SourceException {
Collection<ModifierImpl> currentPhaseModifiers = modifiers.get(phase);
- boolean hasProgressed = hasProgress(currentPhaseModifiers);
+ boolean hasProgressed = tryToProgress(currentPhaseModifiers);
boolean phaseCompleted = root.tryToCompletePhase(phase);
- hasProgressed = (hasProgress(currentPhaseModifiers) | hasProgressed);
+ hasProgressed = (tryToProgress(currentPhaseModifiers) | hasProgressed);
if (phaseCompleted && (currentPhaseModifiers.isEmpty())) {
finishedPhase = phase;
}
- private static boolean hasProgress(final Collection<ModifierImpl> currentPhaseModifiers) {
+ private static boolean tryToProgress(final Collection<ModifierImpl> currentPhaseModifiers) {
Iterator<ModifierImpl> modifier = currentPhaseModifiers.iterator();
boolean hasProgressed = false;
while (modifier.hasNext()) {
- if (modifier.next().isApplied()) {
+ if (modifier.next().tryApply()) {
modifier.remove();
hasProgressed = true;
}
}
SourceException failModifiers(final ModelProcessingPhase identifier) {
- InferenceException sourceEx = new InferenceException("Fail to infer source relationships", root.getStatementSourceReference());
-
-
+ final List<SourceException> exceptions = new ArrayList<>();
for (ModifierImpl mod : modifiers.get(identifier)) {
try {
mod.failModifier();
} catch (SourceException e) {
- sourceEx.addSuppressed(e);
+ exceptions.add(e);
}
}
- return sourceEx;
+
+ final String message = String.format("Yang model processing phase %s failed", identifier);
+ if (exceptions.isEmpty()) {
+ return new InferenceException(message, root.getStatementSourceReference());
+ }
+
+ final InferenceException e = new InferenceException(message, root.getStatementSourceReference(),
+ exceptions.get(0));
+ final Iterator<SourceException> it = exceptions.listIterator(1);
+ while (it.hasNext()) {
+ e.addSuppressed(it.next());
+ }
+
+ return e;
}
void loadStatements() throws SourceException {
}
}
-
private PrefixToModule prefixes() {
- Map<String, QNameModule> prefixes = currentContext.getAllFromNamespace(PrefixToModule.class);
- for (Map.Entry<String, QNameModule> prefix : prefixes.entrySet()) {
- prefixToModuleMap.put(prefix.getKey(), prefix.getValue());
+ final Map<String, ModuleIdentifier> allPrefixes = getRoot().getAllFromNamespace(ImpPrefixToModuleIdentifier
+ .class);
+ final Map<String, ModuleIdentifier> belongsToPrefixes = getRoot().getAllFromNamespace
+ (BelongsToPrefixToModuleIdentifier.class);
+ if (belongsToPrefixes != null)
+ allPrefixes.putAll(belongsToPrefixes);
+
+ for (Entry<String, ModuleIdentifier> stringModuleIdentifierEntry : allPrefixes.entrySet()) {
+ final QNameModule namespace = getRoot().getFromNamespace(ModuleIdentifierToModuleQName.class,
+ stringModuleIdentifierEntry.getValue());
+ prefixToModuleMap.put(stringModuleIdentifierEntry.getKey(), namespace);
}
return prefixToModuleMap;
}
for (Map.Entry<QName, StmtContext<?, ExtensionStatement, EffectiveStatement<QName, ExtensionStatement>>> extension : extensions
.entrySet()) {
qNameToStmtDefMap
- .put(QName.create(YangConstants.RFC6020_YIN_MODULE,
- extension.getKey().getLocalName()),
+ .put((extension.getKey()),
(StatementDefinition) ((StatementContextBase<?, ?, ?>) extension
.getValue()).definition()
.getFactory());
Code Review / yangtools.git / blobdiff