X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-parser-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fparser%2Fstmt%2Freactor%2FBuildGlobalContext.java;h=cc6bf8dda8bc72ec36c318e1a4cffd207d96822c;hb=8f0eab956e51aa57fc101f6c860d59050b72f7d3;hp=5fc5db2061aeedd89c0a82bba01b468b56630549;hpb=84eb2da9322125847d455ce52f182be55f34316b;p=yangtools.git 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 5fc5db2061..cc6bf8dda8 100644 --- 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 @@ -11,6 +11,7 @@ import com.google.common.base.Preconditions; import com.google.common.base.Verify; import com.google.common.collect.HashBasedTable; import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import com.google.common.collect.Table; @@ -29,7 +30,9 @@ import java.util.Optional; import java.util.Set; import java.util.SortedMap; import javax.annotation.Nonnull; +import org.opendaylight.yangtools.util.RecursiveObjectLeaker; import org.opendaylight.yangtools.yang.common.QName; +import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.common.SimpleDateFormatUtil; import org.opendaylight.yangtools.yang.common.YangVersion; import org.opendaylight.yangtools.yang.model.api.ModuleIdentifier; @@ -43,12 +46,16 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.ModelProcessingPhase; import org.opendaylight.yangtools.yang.parser.spi.meta.MutableStatement; 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.Registry; import org.opendaylight.yangtools.yang.parser.spi.meta.NamespaceBehaviour.StorageNodeType; import org.opendaylight.yangtools.yang.parser.spi.meta.NamespaceNotAvailableException; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; import org.opendaylight.yangtools.yang.parser.spi.meta.SomeModifiersUnresolvedException; 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.meta.StmtContextUtils; +import org.opendaylight.yangtools.yang.parser.spi.source.ModulesDeviatedByModules; +import org.opendaylight.yangtools.yang.parser.spi.source.ModulesDeviatedByModules.SupportedModules; import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; import org.opendaylight.yangtools.yang.parser.spi.source.SupportedFeaturesNamespace; @@ -56,21 +63,19 @@ import org.opendaylight.yangtools.yang.parser.spi.source.SupportedFeaturesNamesp 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.SourceSpecificContext.PhaseCompletionProgress; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.RecursiveObjectLeaker; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.Utils; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.EffectiveSchemaContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -class BuildGlobalContext extends NamespaceStorageSupport implements NamespaceBehaviour.Registry { +class BuildGlobalContext extends NamespaceStorageSupport implements Registry { private static final Logger LOG = LoggerFactory.getLogger(BuildGlobalContext.class); - private static final List PHASE_EXECUTION_ORDER = ImmutableList - . builder().add(ModelProcessingPhase.SOURCE_PRE_LINKAGE) + private static final List PHASE_EXECUTION_ORDER = + ImmutableList.builder().add(ModelProcessingPhase.SOURCE_PRE_LINKAGE) .add(ModelProcessingPhase.SOURCE_LINKAGE).add(ModelProcessingPhase.STATEMENT_DEFINITION) .add(ModelProcessingPhase.FULL_DECLARATION).add(ModelProcessingPhase.EFFECTIVE_MODEL).build(); private final Table> definitions = HashBasedTable.create(); + private final Map> modelDefinedStmtDefs = new HashMap<>(); private final Map, NamespaceBehaviourWithListeners> supportedNamespaces = new HashMap<>(); private final List mutableStatementsToSeal = new ArrayList<>(); private final Map supports; @@ -84,7 +89,7 @@ class BuildGlobalContext extends NamespaceStorageSupport implements NamespaceBeh BuildGlobalContext(final Map supports, final Map> supportedValidation, - final StatementParserMode statementParserMode, final Set supportedFeatures) { + final StatementParserMode statementParserMode) { this.supports = Preconditions.checkNotNull(supports, "BuildGlobalContext#supports cannot be null"); switch (statementParserMode) { @@ -102,10 +107,6 @@ class BuildGlobalContext extends NamespaceStorageSupport implements NamespaceBeh addToNs(ValidationBundlesNamespace.class, validationBundle.getKey(), validationBundle.getValue()); } - if (supportedFeatures != null) { - addToNs(SupportedFeaturesNamespace.class, SupportedFeatures.SUPPORTED_FEATURES, - ImmutableSet.copyOf(supportedFeatures)); - } this.supportedVersions = ImmutableSet.copyOf(supports.get(ModelProcessingPhase.INIT).getSupportedVersions()); } @@ -129,6 +130,16 @@ class BuildGlobalContext extends NamespaceStorageSupport implements NamespaceBeh libSources.add(new SourceSpecificContext(this, libSource)); } + void setSupportedFeatures(final Set supportedFeatures) { + addToNs(SupportedFeaturesNamespace.class, SupportedFeatures.SUPPORTED_FEATURES, + ImmutableSet.copyOf(supportedFeatures)); + } + + void setModulesDeviatedByModules(final Map> modulesDeviatedByModules) { + addToNs(ModulesDeviatedByModules.class, SupportedModules.SUPPORTED_MODULES, + ImmutableMap.copyOf(modulesDeviatedByModules)); + } + @Override public StorageNodeType getStorageNodeType() { return StorageNodeType.GLOBAL; @@ -193,6 +204,14 @@ class BuildGlobalContext extends NamespaceStorageSupport implements NamespaceBeh return potential; } + StatementDefinitionContext getModelDefinedStatementDefinition(final QName name) { + return modelDefinedStmtDefs.get(name); + } + + void putModelDefinedStatementDefinition(final QName name, final StatementDefinitionContext def) { + modelDefinedStmtDefs.put(name, def); + } + private void executePhases() throws ReactorException { for (final ModelProcessingPhase phase : PHASE_EXECUTION_ORDER) { startPhase(phase); @@ -223,7 +242,7 @@ class BuildGlobalContext extends NamespaceStorageSupport implements NamespaceBeh private SomeModifiersUnresolvedException propagateException(final SourceSpecificContext source, final RuntimeException cause) throws SomeModifiersUnresolvedException { - final SourceIdentifier sourceId = Utils.createSourceIdentifier(source.getRoot()); + final SourceIdentifier sourceId = StmtContextUtils.createSourceIdentifier(source.getRoot()); if (!(cause instanceof SourceException)) { /* * This should not be happening as all our processing should provide SourceExceptions. @@ -237,6 +256,7 @@ class BuildGlobalContext extends NamespaceStorageSupport implements NamespaceBeh throw new SomeModifiersUnresolvedException(currentPhase, sourceId, cause); } + @SuppressWarnings("checkstyle:illegalCatch") private EffectiveSchemaContext transformEffective() throws ReactorException { Preconditions.checkState(finishedPhase == ModelProcessingPhase.EFFECTIVE_MODEL); final List> rootStatements = new ArrayList<>(sources.size()); @@ -257,7 +277,7 @@ class BuildGlobalContext extends NamespaceStorageSupport implements NamespaceBeh } sealMutableStatements(); - return new EffectiveSchemaContext(rootStatements, rootEffectiveStatements); + return EffectiveSchemaContext.create(rootStatements, rootEffectiveStatements); } private void startPhase(final ModelProcessingPhase phase) { @@ -281,6 +301,7 @@ class BuildGlobalContext extends NamespaceStorageSupport implements NamespaceBeh loadPhaseStatementsFor(libSources); } + @SuppressWarnings("checkstyle:illegalCatch") private void loadPhaseStatementsFor(final Set sources) throws ReactorException { for (final SourceSpecificContext source : sources) { try { @@ -314,22 +335,22 @@ class BuildGlobalContext extends NamespaceStorageSupport implements NamespaceBeh if (suppressed.length > 0) { LOG.error("{} additional errors reported:", suppressed.length); - int i = 1; + int count = 1; for (final Throwable t : suppressed) { // FIXME: this should be configured in the appender, really if (LOG.isDebugEnabled()) { - LOG.error("Error {}: {}", i, t.getMessage(), t); + LOG.error("Error {}: {}", count, t.getMessage(), t); } else { - LOG.error("Error {}: {}", i, t.getMessage()); + LOG.error("Error {}: {}", count, t.getMessage()); } - i++; + count++; } } if (!addedCause) { addedCause = true; - final SourceIdentifier sourceId = Utils.createSourceIdentifier(failedSource.getRoot()); + final SourceIdentifier sourceId = StmtContextUtils.createSourceIdentifier(failedSource.getRoot()); buildFailure = new SomeModifiersUnresolvedException(currentPhase, sourceId, sourceEx); } else { buildFailure.addSuppressed(sourceEx); @@ -338,6 +359,7 @@ class BuildGlobalContext extends NamespaceStorageSupport implements NamespaceBeh return buildFailure; } + @SuppressWarnings("checkstyle:illegalCatch") private void completePhaseActions() throws ReactorException { Preconditions.checkState(currentPhase != null); final List sourcesToProgress = Lists.newArrayList(sources); @@ -360,8 +382,9 @@ class BuildGlobalContext extends NamespaceStorageSupport implements NamespaceBeh switch (sourceProgress) { case FINISHED: currentSource.remove(); - // Fallback to progress, since we were able to make - // progress in computation + // we were able to make progress in computation + progressing = true; + break; case PROGRESS: progressing = true; break; @@ -409,6 +432,7 @@ class BuildGlobalContext extends NamespaceStorageSupport implements NamespaceBeh final Set requiredLibs = new HashSet<>(); for (final SourceSpecificContext source : sources) { collectRequiredSourcesFromLib(libSourcesTable, requiredLibs, source); + removeConflictingLibSources(source, requiredLibs); } return requiredLibs; } @@ -427,8 +451,9 @@ class BuildGlobalContext extends NamespaceStorageSupport implements NamespaceBeh private static SourceSpecificContext getRequiredLibSource(final ModuleIdentifier requiredModule, final TreeBasedTable libSourcesTable) { - return requiredModule.getRevision() == SimpleDateFormatUtil.DEFAULT_DATE_IMP ? getLatestRevision(libSourcesTable - .row(requiredModule.getName())) : libSourcesTable.get(requiredModule.getName(), + return requiredModule.getRevision() == SimpleDateFormatUtil.DEFAULT_DATE_IMP + || requiredModule.getRevision() == SimpleDateFormatUtil.DEFAULT_BELONGS_TO_DATE ? getLatestRevision( + libSourcesTable.row(requiredModule.getName())) : libSourcesTable.get(requiredModule.getName(), requiredModule.getRevision()); } @@ -436,6 +461,22 @@ class BuildGlobalContext extends NamespaceStorageSupport implements NamespaceBeh return sourceMap != null && !sourceMap.isEmpty() ? sourceMap.get(sourceMap.lastKey()) : null; } + // removes required library sources which would cause namespace/name conflict with one of the main sources + // later in the parsing process. this can happen if we add a parent module or a submodule as a main source + // and the same parent module or submodule is added as one of the library sources. + // such situation may occur when using the yang-system-test artifact - if a parent module/submodule is specified + // as its argument and the same dir is specified as one of the library dirs through -p option). + private static void removeConflictingLibSources(final SourceSpecificContext source, + final Set requiredLibs) { + final Iterator requiredLibsIter = requiredLibs.iterator(); + while (requiredLibsIter.hasNext()) { + final SourceSpecificContext currentReqSource = requiredLibsIter.next(); + if (source.getRootIdentifier().equals(currentReqSource.getRootIdentifier())) { + requiredLibsIter.remove(); + } + } + } + private void endPhase(final ModelProcessingPhase phase) { Preconditions.checkState(currentPhase == phase); finishedPhase = currentPhase;