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.SubstatementValidator;
import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport;
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.StmtContext;
import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable;
+import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils;
+import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator;
import org.opendaylight.yangtools.yang.parser.spi.source.ImpPrefixToModuleIdentifier;
import org.opendaylight.yangtools.yang.parser.spi.source.ImpPrefixToNamespace;
import org.opendaylight.yangtools.yang.parser.spi.source.ModuleCtxToModuleIdentifier;
.addAny(YangStmtMapping.TYPEDEF)
.addAny(YangStmtMapping.USES)
.addOptional(YangStmtMapping.YANG_VERSION)
- .addOptional(SupportedExtensionsMapping.SEMANTIC_VERSION)
+ .addOptional(SupportedExtensionsMapping.OPENCONFIG_VERSION)
.build();
public ModuleStatementSupport() {
public void onPreLinkageDeclared(final Mutable<String, ModuleStatement, EffectiveStatement<String, ModuleStatement>> stmt) {
final String moduleName = stmt.getStatementArgument();
- final URI moduleNs = firstAttributeOf(stmt.declaredSubstatements(),
- NamespaceStatement.class);
+ final URI moduleNs = firstAttributeOf(stmt.declaredSubstatements(), NamespaceStatement.class);
SourceException.throwIfNull(moduleNs, stmt.getStatementSourceReference(),
"Namespace of the module [%s] is missing", stmt.getStatementArgument());
stmt.addToNs(ModuleNameToNamespace.class, moduleName, moduleNs);
stmt.addContext(PreLinkageModuleNamespace.class, moduleName, stmt);
- Optional<Date> revisionDate = Optional.ofNullable(Utils.getLatestRevision(stmt.declaredSubstatements()));
+ Optional<Date> revisionDate = Optional.ofNullable(StmtContextUtils.getLatestRevision(
+ stmt.declaredSubstatements()));
if (!revisionDate.isPresent()) {
revisionDate = Optional.of(SimpleDateFormatUtil.DEFAULT_DATE_REV);
}
final QNameModule qNameModule = QNameModule.create(moduleNs, revisionDate.orElse(null)).intern();
stmt.addToNs(ModuleCtxToModuleQName.class, stmt, qNameModule);
+ stmt.setRootIdentifier(ModuleIdentifierImpl.create(stmt.getStatementArgument(),
+ Optional.empty(), revisionDate));
}
@Override
SourceException.throwIf(!moduleNs.isPresent(), stmt.getStatementSourceReference(),
"Namespace of the module [%s] is missing", stmt.getStatementArgument());
- Optional<Date> revisionDate = Optional.ofNullable(Utils.getLatestRevision(stmt.declaredSubstatements()));
+ Optional<Date> revisionDate = Optional.ofNullable(StmtContextUtils.getLatestRevision(
+ stmt.declaredSubstatements()));
if (!revisionDate.isPresent()) {
revisionDate = Optional.of(SimpleDateFormatUtil.DEFAULT_DATE_REV);
}
final QNameModule qNameModule = QNameModule.create(moduleNs.get(), revisionDate.orElse(null)).intern();
+
+ final StmtContext<?, ModuleStatement, EffectiveStatement<String, ModuleStatement>> possibleDuplicateModule =
+ stmt.getFromNamespace(NamespaceToModule.class, qNameModule);
+ if (possibleDuplicateModule != null && possibleDuplicateModule != stmt) {
+ throw new SourceException(stmt.getStatementSourceReference(), "Module namespace collision: %s. At %s",
+ qNameModule.getNamespace(), possibleDuplicateModule.getStatementSourceReference());
+ }
+
final ModuleIdentifier moduleIdentifier = ModuleIdentifierImpl.create(stmt.getStatementArgument(),
Optional.empty(), revisionDate);
}
@Override
- public void onFullDefinitionDeclared(final Mutable<String, ModuleStatement,
- EffectiveStatement<String, ModuleStatement>> stmt) {
- super.onFullDefinitionDeclared(stmt);
- getSubstatementValidator().validate(stmt);
- }
-
protected SubstatementValidator getSubstatementValidator() {
return SUBSTATEMENT_VALIDATOR;
}