import static org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils.firstAttributeOf;
-import com.google.common.base.Optional;
import java.net.URI;
import java.util.Date;
-import java.util.NavigableMap;
-import java.util.TreeMap;
+import java.util.Optional;
import org.opendaylight.yangtools.concepts.SemVer;
import org.opendaylight.yangtools.yang.common.QNameModule;
-import org.opendaylight.yangtools.yang.common.SimpleDateFormatUtil;
-import org.opendaylight.yangtools.yang.model.api.Module;
import org.opendaylight.yangtools.yang.model.api.ModuleIdentifier;
-import org.opendaylight.yangtools.yang.model.api.Rfc6020Mapping;
+import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
import org.opendaylight.yangtools.yang.model.api.stmt.ModuleStatement;
import org.opendaylight.yangtools.yang.model.api.stmt.NamespaceStatement;
import org.opendaylight.yangtools.yang.model.api.stmt.PrefixStatement;
-import org.opendaylight.yangtools.yang.parser.builder.impl.ModuleIdentifierImpl;
+import org.opendaylight.yangtools.yang.model.repo.api.SemVerSourceIdentifier;
+import org.opendaylight.yangtools.yang.model.util.ModuleIdentifierImpl;
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.source.ImpPrefixToModuleIdentifier;
+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.ImpPrefixToNamespace;
+import org.opendaylight.yangtools.yang.parser.spi.source.ImportPrefixToModuleCtx;
import org.opendaylight.yangtools.yang.parser.spi.source.ModuleCtxToModuleIdentifier;
import org.opendaylight.yangtools.yang.parser.spi.source.ModuleCtxToModuleQName;
-import org.opendaylight.yangtools.yang.parser.spi.source.ModuleIdentifierToModuleQName;
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;
public class ModuleStatementSupport extends
AbstractStatementSupport<String, ModuleStatement, EffectiveStatement<String, ModuleStatement>> {
- private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(Rfc6020Mapping
+ private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(YangStmtMapping
.MODULE)
- .addAny(Rfc6020Mapping.ANYXML)
- .addAny(Rfc6020Mapping.AUGMENT)
- .addAny(Rfc6020Mapping.CHOICE)
- .addOptional(Rfc6020Mapping.CONTACT)
- .addAny(Rfc6020Mapping.CONTAINER)
- .addOptional(Rfc6020Mapping.DESCRIPTION)
- .addAny(Rfc6020Mapping.DEVIATION)
- .addAny(Rfc6020Mapping.EXTENSION)
- .addAny(Rfc6020Mapping.FEATURE)
- .addAny(Rfc6020Mapping.GROUPING)
- .addAny(Rfc6020Mapping.IDENTITY)
- .addAny(Rfc6020Mapping.IMPORT)
- .addAny(Rfc6020Mapping.INCLUDE)
- .addAny(Rfc6020Mapping.LEAF)
- .addAny(Rfc6020Mapping.LEAF_LIST)
- .addAny(Rfc6020Mapping.LIST)
- .addMandatory(Rfc6020Mapping.NAMESPACE)
- .addAny(Rfc6020Mapping.NOTIFICATION)
- .addOptional(Rfc6020Mapping.ORGANIZATION)
- .addMandatory(Rfc6020Mapping.PREFIX)
- .addOptional(Rfc6020Mapping.REFERENCE)
- .addAny(Rfc6020Mapping.REVISION)
- .addAny(Rfc6020Mapping.RPC)
- .addAny(Rfc6020Mapping.TYPEDEF)
- .addAny(Rfc6020Mapping.USES)
- .addOptional(Rfc6020Mapping.YANG_VERSION)
- .addOptional(SupportedExtensionsMapping.SEMANTIC_VERSION)
+ .addAny(YangStmtMapping.ANYXML)
+ .addAny(YangStmtMapping.AUGMENT)
+ .addAny(YangStmtMapping.CHOICE)
+ .addOptional(YangStmtMapping.CONTACT)
+ .addAny(YangStmtMapping.CONTAINER)
+ .addOptional(YangStmtMapping.DESCRIPTION)
+ .addAny(YangStmtMapping.DEVIATION)
+ .addAny(YangStmtMapping.EXTENSION)
+ .addAny(YangStmtMapping.FEATURE)
+ .addAny(YangStmtMapping.GROUPING)
+ .addAny(YangStmtMapping.IDENTITY)
+ .addAny(YangStmtMapping.IMPORT)
+ .addAny(YangStmtMapping.INCLUDE)
+ .addAny(YangStmtMapping.LEAF)
+ .addAny(YangStmtMapping.LEAF_LIST)
+ .addAny(YangStmtMapping.LIST)
+ .addMandatory(YangStmtMapping.NAMESPACE)
+ .addAny(YangStmtMapping.NOTIFICATION)
+ .addOptional(YangStmtMapping.ORGANIZATION)
+ .addMandatory(YangStmtMapping.PREFIX)
+ .addOptional(YangStmtMapping.REFERENCE)
+ .addAny(YangStmtMapping.REVISION)
+ .addAny(YangStmtMapping.RPC)
+ .addAny(YangStmtMapping.TYPEDEF)
+ .addAny(YangStmtMapping.USES)
+ .addOptional(YangStmtMapping.YANG_VERSION)
+ .addOptional(SupportedExtensionsMapping.OPENCONFIG_VERSION)
.build();
public ModuleStatementSupport() {
- super(Rfc6020Mapping.MODULE);
+ super(YangStmtMapping.MODULE);
}
@Override
}
@Override
- public void onPreLinkageDeclared(final Mutable<String, ModuleStatement, EffectiveStatement<String, ModuleStatement>> stmt) {
+ 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.fromNullable(Utils.getLatestRevision(stmt.declaredSubstatements
- ()));
- if (!revisionDate.isPresent()) {
- revisionDate = Optional.of(SimpleDateFormatUtil.DEFAULT_DATE_REV);
- }
-
- QNameModule qNameModule = QNameModule.create(moduleNs, revisionDate.orNull()).intern();
+ final Optional<Date> revisionDate = Optional.ofNullable(StmtContextUtils.getLatestRevision(
+ stmt.declaredSubstatements()));
+ final QNameModule qNameModule = QNameModule.create(moduleNs, revisionDate.orElse(null)).intern();
stmt.addToNs(ModuleCtxToModuleQName.class, stmt, qNameModule);
- };
+ stmt.setRootIdentifier(ModuleIdentifierImpl.create(stmt.getStatementArgument(), revisionDate));
+ }
@Override
- public void onLinkageDeclared(final Mutable<String, ModuleStatement, EffectiveStatement<String, ModuleStatement>> stmt) {
+ public void onLinkageDeclared(final Mutable<String, ModuleStatement,
+ EffectiveStatement<String, ModuleStatement>> stmt) {
- Optional<URI> moduleNs = Optional.fromNullable(firstAttributeOf(stmt.declaredSubstatements(),
+ final Optional<URI> moduleNs = Optional.ofNullable(firstAttributeOf(stmt.declaredSubstatements(),
NamespaceStatement.class));
SourceException.throwIf(!moduleNs.isPresent(), stmt.getStatementSourceReference(),
"Namespace of the module [%s] is missing", stmt.getStatementArgument());
- Optional<Date> revisionDate = Optional.fromNullable(Utils.getLatestRevision(stmt.declaredSubstatements()));
- if (!revisionDate.isPresent()) {
- revisionDate = Optional.of(SimpleDateFormatUtil.DEFAULT_DATE_REV);
+ final Optional<Date> revisionDate = Optional.ofNullable(StmtContextUtils.getLatestRevision(
+ stmt.declaredSubstatements()));
+ 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());
}
- QNameModule qNameModule = QNameModule.create(moduleNs.get(), revisionDate.orNull()).intern();
- ModuleIdentifier moduleIdentifier = new ModuleIdentifierImpl(stmt.getStatementArgument(),
- Optional.absent(), revisionDate);
+ final ModuleIdentifier moduleIdentifier = ModuleIdentifierImpl.create(stmt.getStatementArgument(),
+ revisionDate);
stmt.addContext(ModuleNamespace.class, moduleIdentifier, stmt);
stmt.addContext(ModuleNamespaceForBelongsTo.class, moduleIdentifier.getName(), stmt);
stmt.addToNs(ModuleCtxToModuleQName.class, stmt, qNameModule); // tu
stmt.addToNs(ModuleCtxToModuleIdentifier.class, stmt, moduleIdentifier);
stmt.addToNs(ModuleQNameToModuleName.class, qNameModule, stmt.getStatementArgument());
- stmt.addToNs(ModuleIdentifierToModuleQName.class, moduleIdentifier, qNameModule);
- stmt.addToNs(ImpPrefixToModuleIdentifier.class, modulePrefix, moduleIdentifier);
+ stmt.addToNs(ImportPrefixToModuleCtx.class, modulePrefix, stmt);
if (stmt.isEnabledSemanticVersioning()) {
- addToSemVerModuleNamespace(stmt);
+ addToSemVerModuleNamespace(stmt, moduleIdentifier);
}
}
- private void addToSemVerModuleNamespace(
- final Mutable<String, ModuleStatement, EffectiveStatement<String, ModuleStatement>> stmt) {
+ private static void addToSemVerModuleNamespace(
+ final Mutable<String, ModuleStatement, EffectiveStatement<String, ModuleStatement>> stmt,
+ final ModuleIdentifier moduleIdentifier) {
final String moduleName = stmt.getStatementArgument();
- NavigableMap<SemVer, StmtContext<?, ?, ?>> modulesMap = stmt.getFromNamespace(
- SemanticVersionModuleNamespace.class, moduleName);
- if (modulesMap == null) {
- modulesMap = new TreeMap<>();
- }
- SemVer moduleSemVer = stmt.getFromNamespace(SemanticVersionNamespace.class, stmt);
- if(moduleSemVer == null) {
- moduleSemVer = Module.DEFAULT_SEMANTIC_VERSION;
- }
- modulesMap.put(moduleSemVer, stmt);
- stmt.addToNs(SemanticVersionModuleNamespace.class, moduleName, modulesMap);
+ final SemVer moduleSemVer = stmt.getFromNamespace(SemanticVersionNamespace.class, stmt);
+ final SemVerSourceIdentifier id = SemVerSourceIdentifier.create(moduleName, moduleSemVer);
+ stmt.addToNs(SemanticVersionModuleNamespace.class, id, stmt);
}
@Override
- public void onFullDefinitionDeclared(final Mutable<String, ModuleStatement,
- EffectiveStatement<String, ModuleStatement>> stmt) {
- super.onFullDefinitionDeclared(stmt);
- SUBSTATEMENT_VALIDATOR.validate(stmt);
+ protected SubstatementValidator getSubstatementValidator() {
+ return SUBSTATEMENT_VALIDATOR;
}
}
Code Review / yangtools.git / blobdiff