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%2Fimpl%2FYangParserListenerImpl.java;h=e5127b3142f1082f47f4789ffaa7acae875bc4b4;hb=dd5fc92be0fb77ffa0a6441c3900e31c3c191ace;hp=45bedd8c3a9b7da64a762d74a141549adc13065a;hpb=8289f8e18a621ab0e85c8660b4d5926a62ef92c5;p=yangtools.git diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserListenerImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserListenerImpl.java index 45bedd8c3a..e5127b3142 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserListenerImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserListenerImpl.java @@ -18,7 +18,6 @@ import static org.opendaylight.yangtools.yang.parser.impl.ParserListenerUtils.pa import static org.opendaylight.yangtools.yang.parser.impl.ParserListenerUtils.parseStatus; import static org.opendaylight.yangtools.yang.parser.impl.ParserListenerUtils.parseTypeWithBody; import static org.opendaylight.yangtools.yang.parser.impl.ParserListenerUtils.parseUnits; -import static org.opendaylight.yangtools.yang.parser.impl.ParserListenerUtils.parseUnknownTypeWithBody; import static org.opendaylight.yangtools.yang.parser.impl.ParserListenerUtils.parseUserOrdered; import static org.opendaylight.yangtools.yang.parser.impl.ParserListenerUtils.parseYinValue; import static org.opendaylight.yangtools.yang.parser.impl.ParserListenerUtils.stringFromNode; @@ -26,15 +25,17 @@ import static org.opendaylight.yangtools.yang.parser.impl.ParserListenerUtils.st import com.google.common.base.Splitter; import com.google.common.base.Strings; import com.google.common.collect.Iterables; - import java.net.URI; import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Date; import java.util.Iterator; import java.util.List; - +import java.util.Map; +import java.util.Set; +import java.util.TreeMap; import org.antlr.v4.runtime.tree.ParseTree; import org.antlr.v4.runtime.tree.ParseTreeWalker; import org.opendaylight.yangtools.antlrv4.code.gen.YangParser; @@ -71,6 +72,7 @@ import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Yang_version_stmtC import org.opendaylight.yangtools.antlrv4.code.gen.YangParserBaseListener; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; +import org.opendaylight.yangtools.yang.model.api.ModuleImport; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.model.util.BaseTypes; @@ -78,6 +80,7 @@ import org.opendaylight.yangtools.yang.parser.builder.api.AugmentationSchemaBuil import org.opendaylight.yangtools.yang.parser.builder.api.Builder; import org.opendaylight.yangtools.yang.parser.builder.api.ExtensionBuilder; import org.opendaylight.yangtools.yang.parser.builder.api.GroupingBuilder; +import org.opendaylight.yangtools.yang.parser.builder.api.TypeAwareBuilder; import org.opendaylight.yangtools.yang.parser.builder.api.TypeDefinitionBuilder; import org.opendaylight.yangtools.yang.parser.builder.api.UsesNodeBuilder; import org.opendaylight.yangtools.yang.parser.builder.impl.AnyXmlBuilder; @@ -96,24 +99,29 @@ import org.opendaylight.yangtools.yang.parser.builder.impl.RefineHolderImpl; import org.opendaylight.yangtools.yang.parser.builder.impl.RpcDefinitionBuilder; import org.opendaylight.yangtools.yang.parser.builder.impl.UnionTypeBuilder; import org.opendaylight.yangtools.yang.parser.builder.impl.UnknownSchemaNodeBuilderImpl; +import org.opendaylight.yangtools.yang.parser.util.YangParseException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; public final class YangParserListenerImpl extends YangParserBaseListener { private static final Logger LOG = LoggerFactory.getLogger(YangParserListenerImpl.class); + private static final Splitter SLASH_SPLITTER = Splitter.on('/').omitEmptyStrings(); private static final Splitter COLON_SPLITTER = Splitter.on(':'); private static final String AUGMENT_STR = "augment"; private final DateFormat SIMPLE_DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd"); private final SchemaPathStack stack = new SchemaPathStack(); + private final Map> namespaceContext; private final String sourcePath; private QName moduleQName = new QName(null, new Date(0L), null, "dummy"); private ModuleBuilder moduleBuilder; private String moduleName; private int augmentOrder; + private String yangModelPrefix; - public YangParserListenerImpl(final String sourcePath) { + public YangParserListenerImpl(final Map> namespaceContext, final String sourcePath) { + this.namespaceContext = namespaceContext; this.sourcePath = sourcePath; } @@ -121,20 +129,24 @@ public final class YangParserListenerImpl extends YangParserBaseListener { * Create a new instance. * * FIXME: the resulting type needs to be extracted, such that we can reuse - * the "BaseListener" aspect, which need not be exposed to the user. - * Maybe factor out a base class into repo.spi? + * the "BaseListener" aspect, which need not be exposed to the user. Maybe + * factor out a base class into repo.spi? * + * @param namespaceContext * @param sourcePath * @param walker * @param tree - * @return + * @return new instance of YangParserListenerImpl */ - public static YangParserListenerImpl create(final String sourcePath, final ParseTreeWalker walker, final ParseTree tree) { - final YangParserListenerImpl ret = new YangParserListenerImpl(sourcePath); + public static YangParserListenerImpl create(final Map> namespaceContext, + final String sourcePath, final ParseTreeWalker walker, final ParseTree tree) { + final YangParserListenerImpl ret = new YangParserListenerImpl(namespaceContext, sourcePath); walker.walk(ret, tree); return ret; } + + @Override public void enterModule_stmt(final YangParser.Module_stmtContext ctx) { moduleName = stringFromNode(ctx); @@ -203,7 +215,24 @@ public final class YangParserListenerImpl extends YangParserBaseListener { @Override public void enterBelongs_to_stmt(final YangParser.Belongs_to_stmtContext ctx) { - moduleBuilder.setBelongsTo(stringFromNode(ctx)); + final String belongsTo = stringFromNode(ctx); + TreeMap context = namespaceContext.get(belongsTo); + final Map.Entry entry = context.firstEntry(); + // TODO + // Submodule will contain namespace and revision from module to which it + // belongs. If there are multiple modules with same name and different + // revisions, it will has revision from the newest one. + this.moduleQName = QName.create(entry.getValue(), entry.getKey(), moduleQName.getLocalName()); + moduleBuilder.setQNameModule(moduleQName.getModule()); + moduleBuilder.setBelongsTo(belongsTo); + for (int i = 0; i < ctx.getChildCount(); ++i) { + final ParseTree treeNode = ctx.getChild(i); + if (treeNode instanceof Prefix_stmtContext) { + yangModelPrefix = stringFromNode(treeNode); + moduleBuilder.setPrefix(yangModelPrefix); + setLog("prefix", yangModelPrefix); + } + } } @Override @@ -215,11 +244,11 @@ public final class YangParserListenerImpl extends YangParserBaseListener { if (treeNode instanceof Namespace_stmtContext) { final String namespaceStr = stringFromNode(treeNode); final URI namespace = URI.create(namespaceStr); - this.moduleQName = new QName(namespace, moduleQName.getRevision(), moduleQName.getPrefix(), moduleQName.getLocalName()); + this.moduleQName = QName.create(namespace, moduleQName.getRevision(), moduleQName.getLocalName()); moduleBuilder.setQNameModule(moduleQName.getModule()); setLog("namespace", namespaceStr); } else if (treeNode instanceof Prefix_stmtContext) { - final String yangModelPrefix = stringFromNode(treeNode); + yangModelPrefix = stringFromNode(treeNode); this.moduleQName = QName.create(moduleQName.getModule(), yangModelPrefix, moduleQName.getLocalName()); moduleBuilder.setPrefix(yangModelPrefix); setLog("prefix", yangModelPrefix); @@ -244,7 +273,7 @@ public final class YangParserListenerImpl extends YangParserBaseListener { public void enterMeta_stmts(final YangParser.Meta_stmtsContext ctx) { enterLog("meta_stmt", "", ctx.getStart().getLine()); for (int i = 0; i < ctx.getChildCount(); i++) { - ParseTree child = ctx.getChild(i); + final ParseTree child = ctx.getChild(i); if (child instanceof Organization_stmtContext) { final String organization = stringFromNode(child); moduleBuilder.setOrganization(organization); @@ -291,7 +320,7 @@ public final class YangParserListenerImpl extends YangParserBaseListener { try { final Date revisionDate = SIMPLE_DATE_FORMAT.parse(revisionDateStr); if ((revisionDate != null) && (this.moduleQName.getRevision().compareTo(revisionDate) < 0)) { - this.moduleQName = new QName(moduleQName.getNamespace(), revisionDate, moduleQName.getPrefix(), moduleQName.getLocalName()); + this.moduleQName = QName.create(moduleQName.getNamespace(), revisionDate, moduleQName.getLocalName()); moduleBuilder.setQNameModule(moduleQName.getModule()); setLog("revision", revisionDate.toString()); for (int i = 0; i < treeNode.getChildCount(); ++i) { @@ -319,8 +348,7 @@ public final class YangParserListenerImpl extends YangParserBaseListener { final ParseTree treeNode = ctx.getChild(i); if (treeNode instanceof Prefix_stmtContext) { importPrefix = stringFromNode(treeNode); - } - if (treeNode instanceof Revision_date_stmtContext) { + } else if (treeNode instanceof Revision_date_stmtContext) { String importRevisionStr = stringFromNode(treeNode); try { importRevision = SIMPLE_DATE_FORMAT.parse(importRevisionStr); @@ -338,6 +366,31 @@ public final class YangParserListenerImpl extends YangParserBaseListener { exitLog("import"); } + @Override + public void enterInclude_stmt(YangParser.Include_stmtContext ctx) { + final int line = ctx.getStart().getLine(); + final String includeName = stringFromNode(ctx); + enterLog("import", includeName, line); + + Date includeRevision = null; + for (int i = 0; i < ctx.getChildCount(); i++) { + final ParseTree treeNode = ctx.getChild(i); + if (treeNode instanceof Revision_date_stmtContext) { + final String importRevisionStr = stringFromNode(treeNode); + try { + includeRevision = SIMPLE_DATE_FORMAT.parse(importRevisionStr); + } catch (ParseException e) { + LOG.warn("Failed to parse import revision-date at line {}: {}", line, importRevisionStr, e); + } + } + } + moduleBuilder.addInclude(includeName, includeRevision); + } + + @Override public void exitInclude_stmt(YangParser.Include_stmtContext ctx) { + exitLog("include"); + } + @Override public void enterAugment_stmt(final YangParser.Augment_stmtContext ctx) { final int line = ctx.getStart().getLine(); @@ -345,7 +398,8 @@ public final class YangParserListenerImpl extends YangParserBaseListener { enterLog(AUGMENT_STR, augmentPath, line); stack.push(); - AugmentationSchemaBuilder builder = moduleBuilder.addAugment(line, augmentPath, augmentOrder++); + final SchemaPath targetPath = parseXPathString(augmentPath, line); + final AugmentationSchemaBuilder builder = moduleBuilder.addAugment(line, augmentPath, targetPath, augmentOrder++); for (int i = 0; i < ctx.getChildCount(); i++) { ParseTree child = ctx.getChild(i); @@ -375,16 +429,16 @@ public final class YangParserListenerImpl extends YangParserBaseListener { final int line = ctx.getStart().getLine(); final String extName = stringFromNode(ctx); enterLog("extension", extName, line); - QName qname = QName.create(moduleQName, extName); - SchemaPath path = stack.addNodeToPath(qname); + final QName qname = QName.create(moduleQName, extName); + final SchemaPath path = stack.addNodeToPath(qname); - ExtensionBuilder builder = moduleBuilder.addExtension(qname, line, path); + final ExtensionBuilder builder = moduleBuilder.addExtension(qname, line, path); parseSchemaNodeArgs(ctx, builder); String argument = null; boolean yin = false; for (int i = 0; i < ctx.getChildCount(); i++) { - ParseTree child = ctx.getChild(i); + final ParseTree child = ctx.getChild(i); if (child instanceof Argument_stmtContext) { argument = stringFromNode(child); yin = parseYinValue((Argument_stmtContext) child); @@ -408,10 +462,10 @@ public final class YangParserListenerImpl extends YangParserBaseListener { final int line = ctx.getStart().getLine(); final String typedefName = stringFromNode(ctx); enterLog("typedef", typedefName, line); - QName typedefQName = QName.create(moduleQName, typedefName); - SchemaPath path = stack.addNodeToPath(typedefQName); + final QName typedefQName = QName.create(moduleQName, typedefName); + final SchemaPath path = stack.addNodeToPath(typedefQName); - TypeDefinitionBuilder builder = moduleBuilder.addTypedef(line, typedefQName, path); + final TypeDefinitionBuilder builder = moduleBuilder.addTypedef(line, typedefQName, path); parseSchemaNodeArgs(ctx, builder); builder.setUnits(parseUnits(ctx)); builder.setDefaultValue(parseDefault(ctx)); @@ -431,7 +485,7 @@ public final class YangParserListenerImpl extends YangParserBaseListener { final String typeName = stringFromNode(ctx); enterLog("type", typeName, line); - final QName typeQName = parseQName(typeName); + final QName typeQName = parseQName(typeName, line); TypeDefinition type; Type_body_stmtsContext typeBody = null; @@ -457,47 +511,89 @@ public final class YangParserListenerImpl extends YangParserBaseListener { case "union": qname = BaseTypes.UNION_QNAME; stack.addNodeToPath(qname); - UnionTypeBuilder unionBuilder = moduleBuilder.addUnionType(line, moduleQName.getModule()); - Builder parent = moduleBuilder.getActualNode(); + final UnionTypeBuilder unionBuilder = moduleBuilder.addUnionType(line, moduleQName.getModule()); + final Builder parent = moduleBuilder.getActualNode(); unionBuilder.setParent(parent); moduleBuilder.enterNode(unionBuilder); break; case "identityref": qname = BaseTypes.IDENTITYREF_QNAME; - SchemaPath path = stack.addNodeToPath(qname); + final SchemaPath path = stack.addNodeToPath(qname); moduleBuilder.addIdentityrefType(line, path, getIdentityrefBase(typeBody)); break; default: - type = parseTypeWithBody(typeName, typeBody, stack.currentSchemaPath(), moduleQName, moduleBuilder.getActualNode()); + type = parseTypeWithBody(typeName, typeBody, stack.currentSchemaPath(), moduleQName, + moduleBuilder.getActualNode()); moduleBuilder.setType(type); stack.addNodeToPath(type.getQName()); } } } else { - type = parseUnknownTypeWithBody(typeQName, typeBody, stack.currentSchemaPath(), moduleQName, moduleBuilder.getActualNode()); - // add parent node of this type statement to dirty nodes - moduleBuilder.markActualNodeDirty(); - moduleBuilder.setType(type); - stack.addNodeToPath(type.getQName()); + final TypeAwareBuilder parent = (TypeAwareBuilder) moduleBuilder.getActualNode(); + if (typeBody == null) { + parent.setTypeQName(typeQName); + moduleBuilder.markActualNodeDirty(); + } else { + ParserListenerUtils.parseUnknownTypeWithBody(typeBody, parent, typeQName, moduleBuilder, + moduleQName, stack.currentSchemaPath()); + } + stack.addNodeToPath(QName.create(moduleQName.getModule(), typeQName.getLocalName())); } - } - private QName parseQName(final String typeName) { - final QName typeQName; - if (typeName.indexOf(':') != -1) { - final Iterator split = COLON_SPLITTER.split(typeName).iterator(); + /** + * Method transforms string representation of yang element (i.e. leaf name, container name etc.) into QName. + * The namespace of QName is assigned from parent module same as revision date of module. If String qname parameter + * contains ":" the string is evaluated as prefix:name of element. In this case method will look into import map + * and extract correct ModuleImport. If such import is not present in import map the method will throw {@link YangParseException} + *
+ * If ModuleImport is present but the value of namespace in ModuleImport is null the method will throw {@link YangParseException} + * + * @param qnameString QName value as String + * @param line line in Yang model document where QName occur. + * @return transformed string qname parameter as QName structure. + * + * @throws YangParseException + */ + private QName parseQName(final String qnameString, final int line) { + final QName qname; + if (qnameString.indexOf(':') == -1) { + qname = QName.create(moduleQName, qnameString); + } else { + final Iterator split = COLON_SPLITTER.split(qnameString).iterator(); final String prefix = split.next(); final String name = split.next(); - if (prefix.equals(moduleQName.getPrefix())) { - typeQName = QName.create(moduleQName, name); + if (prefix.equals(moduleBuilder.getPrefix())) { + qname = QName.create(moduleQName, name); } else { - typeQName = QName.create(QNameModule.create(null, null), prefix, name); + final ModuleImport imp = moduleBuilder.getImport(prefix); + if (imp == null) { + LOG.debug("Error in module {} at line {}: No import found with prefix {}", moduleName, line, prefix); + throw new YangParseException(moduleName, line, "Error in module " + moduleName + + " No import found with prefix " + prefix + " not found."); + } + Date revision = imp.getRevision(); + TreeMap namespaces = namespaceContext.get(imp.getModuleName()); + if (namespaces == null) { + throw new YangParseException(moduleName, line, String.format("Imported module %s not found", + imp.getModuleName())); + } + URI namespace; + if (revision == null) { + revision = namespaces.lastEntry().getKey(); + namespace = namespaces.lastEntry().getValue(); + } else { + // FIXME: this lookup does not look right, as we will end up with + // a qname which does not have a namespace. At any rate we + // should arrive at a QNameModule! + namespace = namespaces.get(revision); + } + + final QNameModule mod = QNameModule.cachedReference(QNameModule.create(namespace, revision)); + qname = QName.create(mod, name); } - } else { - typeQName = QName.create(moduleQName, typeName); } - return typeQName; + return qname; } @Override @@ -514,10 +610,10 @@ public final class YangParserListenerImpl extends YangParserBaseListener { final int line = ctx.getStart().getLine(); final String groupName = stringFromNode(ctx); enterLog("grouping", groupName, line); - QName groupQName = QName.create(moduleQName, groupName); - SchemaPath path = stack.addNodeToPath(groupQName); + final QName groupQName = QName.create(moduleQName, groupName); + final SchemaPath path = stack.addNodeToPath(groupQName); - GroupingBuilder builder = moduleBuilder.addGrouping(ctx.getStart().getLine(), groupQName, path); + final GroupingBuilder builder = moduleBuilder.addGrouping(ctx.getStart().getLine(), groupQName, path); parseSchemaNodeArgs(ctx, builder); moduleBuilder.enterNode(builder); @@ -535,10 +631,10 @@ public final class YangParserListenerImpl extends YangParserBaseListener { final String containerName = stringFromNode(ctx); enterLog("container", containerName, line); - QName containerQName = QName.create(moduleQName, containerName); - SchemaPath path = stack.addNodeToPath(containerQName); + final QName containerQName = QName.create(moduleQName, containerName); + final SchemaPath path = stack.addNodeToPath(containerQName); - ContainerSchemaNodeBuilder builder = moduleBuilder.addContainerNode(line, containerQName, path); + final ContainerSchemaNodeBuilder builder = moduleBuilder.addContainerNode(line, containerQName, path); parseSchemaNodeArgs(ctx, builder); parseConstraints(ctx, builder.getConstraints()); builder.setConfiguration(getConfig(ctx, builder, moduleName, line)); @@ -566,10 +662,10 @@ public final class YangParserListenerImpl extends YangParserBaseListener { final String leafName = stringFromNode(ctx); enterLog("leaf", leafName, line); - QName leafQName = QName.create(moduleQName, leafName); - SchemaPath path = stack.addNodeToPath(leafQName); + final QName leafQName = QName.create(moduleQName, leafName); + final SchemaPath path = stack.addNodeToPath(leafQName); - LeafSchemaNodeBuilder builder = moduleBuilder.addLeafNode(line, leafQName, path); + final LeafSchemaNodeBuilder builder = moduleBuilder.addLeafNode(line, leafQName, path); parseSchemaNodeArgs(ctx, builder); parseConstraints(ctx, builder.getConstraints()); builder.setConfiguration(getConfig(ctx, builder, moduleName, line)); @@ -577,7 +673,7 @@ public final class YangParserListenerImpl extends YangParserBaseListener { String defaultStr = null; String unitsStr = null; for (int i = 0; i < ctx.getChildCount(); i++) { - ParseTree child = ctx.getChild(i); + final ParseTree child = ctx.getChild(i); if (child instanceof Default_stmtContext) { defaultStr = stringFromNode(child); } else if (child instanceof Units_stmtContext) { @@ -600,9 +696,10 @@ public final class YangParserListenerImpl extends YangParserBaseListener { public void enterUses_stmt(final YangParser.Uses_stmtContext ctx) { final int line = ctx.getStart().getLine(); final String groupingPathStr = stringFromNode(ctx); + final SchemaPath groupingPath = parseXPathString(groupingPathStr, line); enterLog("uses", groupingPathStr, line); - UsesNodeBuilder builder = moduleBuilder.addUsesNode(line, groupingPathStr); + final UsesNodeBuilder builder = moduleBuilder.addUsesNode(line, groupingPath); moduleBuilder.enterNode(builder); } @@ -620,10 +717,11 @@ public final class YangParserListenerImpl extends YangParserBaseListener { enterLog(AUGMENT_STR, augmentPath, line); stack.push(); - AugmentationSchemaBuilder builder = moduleBuilder.addAugment(line, augmentPath, augmentOrder++); + final SchemaPath targetPath = parseXPathString(augmentPath, line); + final AugmentationSchemaBuilder builder = moduleBuilder.addAugment(line, augmentPath, targetPath, augmentOrder++); for (int i = 0; i < ctx.getChildCount(); i++) { - ParseTree child = ctx.getChild(i); + final ParseTree child = ctx.getChild(i); if (child instanceof Description_stmtContext) { builder.setDescription(stringFromNode(child)); } else if (child instanceof Reference_stmtContext) { @@ -650,7 +748,7 @@ public final class YangParserListenerImpl extends YangParserBaseListener { final String refineString = stringFromNode(ctx); enterLog("refine", refineString, ctx.getStart().getLine()); - RefineHolderImpl refine = parseRefine(ctx, moduleName); + final RefineHolderImpl refine = parseRefine(ctx, moduleName); moduleBuilder.addRefine(refine); moduleBuilder.enterNode(refine); } @@ -666,10 +764,10 @@ public final class YangParserListenerImpl extends YangParserBaseListener { final int line = ctx.getStart().getLine(); final String leafListName = stringFromNode(ctx); enterLog("leaf-list", leafListName, line); - QName leafListQName = QName.create(moduleQName, leafListName); - SchemaPath path = stack.addNodeToPath(leafListQName); + final QName leafListQName = QName.create(moduleQName, leafListName); + final SchemaPath path = stack.addNodeToPath(leafListQName); - LeafListSchemaNodeBuilder builder = moduleBuilder.addLeafListNode(line, leafListQName, path); + final LeafListSchemaNodeBuilder builder = moduleBuilder.addLeafListNode(line, leafListQName, path); moduleBuilder.enterNode(builder); parseSchemaNodeArgs(ctx, builder); @@ -699,10 +797,10 @@ public final class YangParserListenerImpl extends YangParserBaseListener { final String listName = stringFromNode(ctx); enterLog("list", listName, line); - QName listQName = QName.create(moduleQName, listName); - SchemaPath path = stack.addNodeToPath(listQName); + final QName listQName = QName.create(moduleQName, listName); + final SchemaPath path = stack.addNodeToPath(listQName); - ListSchemaNodeBuilder builder = moduleBuilder.addListNode(line, listQName, path); + final ListSchemaNodeBuilder builder = moduleBuilder.addListNode(line, listQName, path); moduleBuilder.enterNode(builder); parseSchemaNodeArgs(ctx, builder); @@ -710,13 +808,13 @@ public final class YangParserListenerImpl extends YangParserBaseListener { builder.setConfiguration(getConfig(ctx, builder, moduleName, line)); for (int i = 0; i < ctx.getChildCount(); ++i) { - ParseTree childNode = ctx.getChild(i); + final ParseTree childNode = ctx.getChild(i); if (childNode instanceof Ordered_by_stmtContext) { final Ordered_by_stmtContext orderedBy = (Ordered_by_stmtContext) childNode; final boolean userOrdered = parseUserOrdered(orderedBy); builder.setUserOrdered(userOrdered); } else if (childNode instanceof Key_stmtContext) { - List key = createListKey((Key_stmtContext) childNode); + final Set key = createListKey((Key_stmtContext) childNode); builder.setKeys(key); } } @@ -734,10 +832,10 @@ public final class YangParserListenerImpl extends YangParserBaseListener { final String anyXmlName = stringFromNode(ctx); enterLog("anyxml", anyXmlName, line); - QName anyXmlQName = QName.create(moduleQName, anyXmlName); - SchemaPath path = stack.addNodeToPath(anyXmlQName); + final QName anyXmlQName = QName.create(moduleQName, anyXmlName); + final SchemaPath path = stack.addNodeToPath(anyXmlQName); - AnyXmlBuilder builder = moduleBuilder.addAnyXml(line, anyXmlQName, path); + final AnyXmlBuilder builder = moduleBuilder.addAnyXml(line, anyXmlQName, path); moduleBuilder.enterNode(builder); parseSchemaNodeArgs(ctx, builder); @@ -757,10 +855,10 @@ public final class YangParserListenerImpl extends YangParserBaseListener { final String choiceName = stringFromNode(ctx); enterLog("choice", choiceName, line); - QName choiceQName = QName.create(moduleQName, choiceName); - SchemaPath path = stack.addNodeToPath(choiceQName); + final QName choiceQName = QName.create(moduleQName, choiceName); + final SchemaPath path = stack.addNodeToPath(choiceQName); - ChoiceBuilder builder = moduleBuilder.addChoice(line, choiceQName, path); + final ChoiceBuilder builder = moduleBuilder.addChoice(line, choiceQName, path); moduleBuilder.enterNode(builder); parseSchemaNodeArgs(ctx, builder); @@ -769,9 +867,9 @@ public final class YangParserListenerImpl extends YangParserBaseListener { // set 'default' case for (int i = 0; i < ctx.getChildCount(); i++) { - ParseTree child = ctx.getChild(i); + final ParseTree child = ctx.getChild(i); if (child instanceof Default_stmtContext) { - String defaultCase = stringFromNode(child); + final String defaultCase = stringFromNode(child); builder.setDefaultCase(defaultCase); break; } @@ -790,10 +888,10 @@ public final class YangParserListenerImpl extends YangParserBaseListener { final String caseName = stringFromNode(ctx); enterLog("case", caseName, line); - QName caseQName = QName.create(moduleQName, caseName); - SchemaPath path = stack.addNodeToPath(caseQName); + final QName caseQName = QName.create(moduleQName, caseName); + final SchemaPath path = stack.addNodeToPath(caseQName); - ChoiceCaseBuilder builder = moduleBuilder.addCase(line, caseQName, path); + final ChoiceCaseBuilder builder = moduleBuilder.addCase(line, caseQName, path); moduleBuilder.enterNode(builder); parseSchemaNodeArgs(ctx, builder); @@ -812,10 +910,10 @@ public final class YangParserListenerImpl extends YangParserBaseListener { final String notificationName = stringFromNode(ctx); enterLog("notification", notificationName, line); - QName notificationQName = QName.create(moduleQName, notificationName); - SchemaPath path = stack.addNodeToPath(notificationQName); + final QName notificationQName = QName.create(moduleQName, notificationName); + final SchemaPath path = stack.addNodeToPath(notificationQName); - NotificationBuilder builder = moduleBuilder.addNotification(line, notificationQName, path); + final NotificationBuilder builder = moduleBuilder.addNotification(line, notificationQName, path); moduleBuilder.enterNode(builder); parseSchemaNodeArgs(ctx, builder); @@ -854,13 +952,12 @@ public final class YangParserListenerImpl extends YangParserBaseListener { final String rpcName = stringFromNode(ctx); enterLog("rpc", rpcName, line); - QName rpcQName = QName.create(moduleQName, rpcName); - SchemaPath path = stack.addNodeToPath(rpcQName); + final QName rpcQName = QName.create(moduleQName, rpcName); + final SchemaPath path = stack.addNodeToPath(rpcQName); - RpcDefinitionBuilder rpcBuilder = moduleBuilder.addRpc(line, rpcQName, path); + final RpcDefinitionBuilder rpcBuilder = moduleBuilder.addRpc(line, rpcQName, path); moduleBuilder.enterNode(rpcBuilder); - parseSchemaNodeArgs(ctx, rpcBuilder); } @@ -876,10 +973,10 @@ public final class YangParserListenerImpl extends YangParserBaseListener { final String input = "input"; enterLog(input, input, line); - QName rpcQName = QName.create(moduleQName, input); - SchemaPath path = stack.addNodeToPath(rpcQName); + final QName rpcQName = QName.create(moduleQName, input); + final SchemaPath path = stack.addNodeToPath(rpcQName); - ContainerSchemaNodeBuilder builder = moduleBuilder.addRpcInput(line, rpcQName, path); + final ContainerSchemaNodeBuilder builder = moduleBuilder.addRpcInput(line, rpcQName, path); moduleBuilder.enterNode(builder); builder.setConfiguration(true); @@ -899,10 +996,10 @@ public final class YangParserListenerImpl extends YangParserBaseListener { final String output = "output"; enterLog(output, output, line); - QName rpcQName = QName.create(moduleQName, output); - SchemaPath path = stack.addNodeToPath(rpcQName); + final QName rpcQName = QName.create(moduleQName, output); + final SchemaPath path = stack.addNodeToPath(rpcQName); - ContainerSchemaNodeBuilder builder = moduleBuilder.addRpcOutput(path, rpcQName, line); + final ContainerSchemaNodeBuilder builder = moduleBuilder.addRpcOutput(path, rpcQName, line); moduleBuilder.enterNode(builder); builder.setConfiguration(true); @@ -922,10 +1019,10 @@ public final class YangParserListenerImpl extends YangParserBaseListener { final String featureName = stringFromNode(ctx); enterLog("feature", featureName, line); - QName featureQName = QName.create(moduleQName, featureName); - SchemaPath path = stack.addNodeToPath(featureQName); + final QName featureQName = QName.create(moduleQName, featureName); + final SchemaPath path = stack.addNodeToPath(featureQName); - FeatureBuilder featureBuilder = moduleBuilder.addFeature(line, featureQName, path); + final FeatureBuilder featureBuilder = moduleBuilder.addFeature(line, featureQName, path); moduleBuilder.enterNode(featureBuilder); parseSchemaNodeArgs(ctx, featureBuilder); @@ -940,12 +1037,18 @@ public final class YangParserListenerImpl extends YangParserBaseListener { @Override public void enterDeviation_stmt(final YangParser.Deviation_stmtContext ctx) { final int line = ctx.getStart().getLine(); - final String targetPath = stringFromNode(ctx); - enterLog("deviation", targetPath, line); + final String targetPathStr = stringFromNode(ctx); + if (!targetPathStr.startsWith("/")) { + throw new YangParseException(moduleName, line, + "Deviation argument string must be an absolute schema node identifier."); + } + enterLog("deviation", targetPathStr, line); String reference = null; String deviate = null; - DeviationBuilder builder = moduleBuilder.addDeviation(line, targetPath); + + final SchemaPath targetPath = parseXPathString(targetPathStr, line); + final DeviationBuilder builder = moduleBuilder.addDeviation(line, targetPath); moduleBuilder.enterNode(builder); for (int i = 0; i < ctx.getChildCount(); i++) { @@ -966,6 +1069,22 @@ public final class YangParserListenerImpl extends YangParserBaseListener { builder.setDeviate(deviate); } + public SchemaPath parseXPathString(final String xpathString, final int line) { + final boolean absolute = !xpathString.isEmpty() && xpathString.charAt(0) == '/'; + + final List path = new ArrayList<>(); + for (String pathElement : SLASH_SPLITTER.split(xpathString)) { + final Iterator it = COLON_SPLITTER.split(pathElement).iterator(); + final String s = it.next(); + if (it.hasNext()) { + path.add(parseQName(pathElement, line)); + } else { + path.add(QName.create(moduleQName, s)); + } + } + return SchemaPath.create(path, absolute); + } + @Override public void exitDeviation_stmt(final YangParser.Deviation_stmtContext ctx) { moduleBuilder.exitNode(); @@ -979,15 +1098,15 @@ public final class YangParserListenerImpl extends YangParserBaseListener { enterLog("identity", identityName, line); final QName identityQName = QName.create(moduleQName, identityName); - SchemaPath path = stack.addNodeToPath(identityQName); + final SchemaPath path = stack.addNodeToPath(identityQName); - IdentitySchemaNodeBuilder builder = moduleBuilder.addIdentity(identityQName, line, path); + final IdentitySchemaNodeBuilder builder = moduleBuilder.addIdentity(identityQName, line, path); moduleBuilder.enterNode(builder); parseSchemaNodeArgs(ctx, builder); for (int i = 0; i < ctx.getChildCount(); i++) { - ParseTree child = ctx.getChild(i); + final ParseTree child = ctx.getChild(i); if (child instanceof Base_stmtContext) { String baseIdentityName = stringFromNode(child); builder.setBaseIdentityName(baseIdentityName); @@ -1026,39 +1145,35 @@ public final class YangParserListenerImpl extends YangParserBaseListener { enterLog("unknown-node", nodeParameter, line); final String nodeTypeStr = ctx.getChild(0).getText(); - final Iterator splittedElement = COLON_SPLITTER.split(nodeTypeStr).iterator(); - final String e0 = splittedElement.next(); - final QName nodeType; - if (splittedElement.hasNext()) { - nodeType = QName.create(moduleQName.getModule(), e0, splittedElement.next()); - } else { - nodeType = QName.create(moduleQName, e0); - } + final QName nodeType = parseQName(nodeTypeStr, line); - QName qname; + QName qname = null; try { - if (!Strings.isNullOrEmpty(nodeParameter)) { + //FIXME: rewrite whole method to handle unknown nodes properly. + // This should be bugfix for bug https://bugs.opendaylight.org/show_bug.cgi?id=1539 + // After this fix bug https://bugs.opendaylight.org/show_bug.cgi?id=1538 MUST be fixed since + // they are dependent!!! + if (Strings.isNullOrEmpty(nodeParameter)) { + qname = nodeType; + } else { final Iterable splittedName = COLON_SPLITTER.split(nodeParameter); final Iterator it = splittedName.iterator(); - if (Iterables.size(splittedName) == 2) { - qname = QName.create(QNameModule.create(null, null), it.next(), it.next()); + qname = parseQName(nodeParameter, line); } else { qname = QName.create(moduleQName, it.next()); } - } else { - qname = nodeType; } - } catch (IllegalArgumentException e) { + } catch (IllegalArgumentException | YangParseException ex) { qname = nodeType; } - SchemaPath path = stack.addNodeToPath(qname); - UnknownSchemaNodeBuilderImpl builder = moduleBuilder.addUnknownSchemaNode(line, qname, path); + final SchemaPath path = stack.addNodeToPath(qname); + + final UnknownSchemaNodeBuilderImpl builder = moduleBuilder.addUnknownSchemaNode(line, qname, path); builder.setNodeType(nodeType); builder.setNodeParameter(nodeParameter); - parseSchemaNodeArgs(ctx, builder); moduleBuilder.enterNode(builder); }