X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=yang%2Fyang-parser-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fparser%2Fbuilder%2Fimpl%2FBuilderUtils.java;h=759e779eed26e29a079b7e37681515022e8a160a;hb=ff4a1007e241b1b88883c7fb0357c5089fafcf25;hp=70eb185ca25b3063538a62c2285526d1a96d08ef;hpb=f7704dd56038f8e7e0143bb7efe1414700a4fab7;p=yangtools.git diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/BuilderUtils.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/BuilderUtils.java index 70eb185ca2..759e779eed 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/BuilderUtils.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/BuilderUtils.java @@ -12,23 +12,34 @@ import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.base.Splitter; import com.google.common.collect.Collections2; +import com.google.common.collect.Iterables; import com.google.common.io.ByteSource; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; +import java.net.URI; import java.util.ArrayList; import java.util.Collection; import java.util.Date; +import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; +import java.util.LinkedHashSet; 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.apache.commons.io.IOUtils; +import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Belongs_to_stmtContext; +import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Module_header_stmtsContext; +import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Module_stmtContext; +import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Namespace_stmtContext; +import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Revision_stmtsContext; +import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Submodule_header_stmtsContext; +import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Submodule_stmtContext; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; @@ -56,7 +67,10 @@ import org.opendaylight.yangtools.yang.parser.builder.api.GroupingBuilder; import org.opendaylight.yangtools.yang.parser.builder.api.GroupingMember; import org.opendaylight.yangtools.yang.parser.builder.api.SchemaNodeBuilder; import org.opendaylight.yangtools.yang.parser.builder.api.TypeDefinitionBuilder; +import org.opendaylight.yangtools.yang.parser.builder.api.UnknownSchemaNodeBuilder; import org.opendaylight.yangtools.yang.parser.builder.api.UsesNodeBuilder; +import org.opendaylight.yangtools.yang.parser.impl.ParserListenerUtils; +import org.opendaylight.yangtools.yang.parser.impl.util.YangModelDependencyInfo; import org.opendaylight.yangtools.yang.parser.util.NamedByteArrayInputStream; import org.opendaylight.yangtools.yang.parser.util.NamedFileInputStream; import org.opendaylight.yangtools.yang.parser.util.YangParseException; @@ -66,7 +80,6 @@ import org.slf4j.LoggerFactory; public final class BuilderUtils { private static final Logger LOG = LoggerFactory.getLogger(BuilderUtils.class); - private static final Splitter SLASH_SPLITTER = Splitter.on('/').omitEmptyStrings(); private static final Splitter COLON_SPLITTER = Splitter.on(':'); private static final Date NULL_DATE = new Date(0L); private static final String INPUT = "input"; @@ -166,6 +179,26 @@ public final class BuilderUtils { return dependentModule; } + public static ModuleBuilder findModuleFromBuilders(ModuleImport imp, Iterable modules) { + String name = imp.getModuleName(); + Date revision = imp.getRevision(); + TreeMap map = new TreeMap<>(); + for (ModuleBuilder module : modules) { + if (module != null) { + if (module.getName().equals(name)) { + map.put(module.getRevision(), module); + } + } + } + if (map.isEmpty()) { + return null; + } + if (revision == null) { + return map.lastEntry().getValue(); + } + return map.get(revision); + } + /** * Find module from context based on prefix. * @@ -216,32 +249,6 @@ public final class BuilderUtils { return result; } - /** - * Parse XPath string. - * - * @param xpathString - * XPath as String - * @return SchemaPath from given String - */ - public static SchemaPath parseXPathString(final String xpathString) { - 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(); - - final QName name; - if (it.hasNext()) { - name = new QName(null, null, s, it.next()); - } else { - name = new QName(null, null, null, s); - } - path.add(name); - } - return SchemaPath.create(path, absolute); - } - /** * Add all augment's child nodes to given target. * @@ -354,29 +361,38 @@ public final class BuilderUtils { } } - public static DataSchemaNodeBuilder findSchemaNode(final List path, final SchemaNodeBuilder parentNode) { - DataSchemaNodeBuilder node = null; + public static SchemaNodeBuilder findSchemaNode(final Iterable path, final SchemaNodeBuilder parentNode) { + SchemaNodeBuilder node = null; SchemaNodeBuilder parent = parentNode; + int size = Iterables.size(path); int i = 0; - while (i < path.size()) { - String name = path.get(i).getLocalName(); + for (QName qname : path) { + String name = qname.getLocalName(); if (parent instanceof DataNodeContainerBuilder) { node = ((DataNodeContainerBuilder) parent).getDataChildByName(name); + if (node == null) { + node = findUnknownNode(name, parent); + } } else if (parent instanceof ChoiceBuilder) { node = ((ChoiceBuilder) parent).getCaseNodeByName(name); + if (node == null) { + node = findUnknownNode(name, parent); + } } else if (parent instanceof RpcDefinitionBuilder) { if ("input".equals(name)) { node = ((RpcDefinitionBuilder) parent).getInput(); } else if ("output".equals(name)) { node = ((RpcDefinitionBuilder) parent).getOutput(); } else { - return null; + if (node == null) { + node = findUnknownNode(name, parent); + } } } else { - return null; + node = findUnknownNode(name, parent); } - if (i < path.size() - 1) { + if (i < size - 1) { parent = node; } i = i + 1; @@ -385,6 +401,15 @@ public final class BuilderUtils { return node; } + private static UnknownSchemaNodeBuilder findUnknownNode(final String name, final Builder parent) { + for (UnknownSchemaNodeBuilder un : parent.getUnknownNodes()) { + if (un.getQName().getLocalName().equals(name)) { + return un; + } + } + return null; + } + /** * * Find a builder for node in data namespace of YANG module. @@ -411,7 +436,16 @@ public final class BuilderUtils { Optional currentNode = getDataNamespaceChild(module, first); while (currentNode.isPresent() && path.hasNext()) { - currentNode = findDataChild(currentNode.get(), path.next()); + SchemaNodeBuilder currentParent = currentNode.get(); + QName currentPath = path.next(); + currentNode = findDataChild(currentParent, currentPath); + if (!currentNode.isPresent()) { + for (SchemaNodeBuilder un : currentParent.getUnknownNodes()) { + if (un.getQName().equals(currentPath)) { + currentNode = Optional.of(un); + } + } + } } return currentNode; } @@ -438,7 +472,7 @@ public final class BuilderUtils { * Class to be checked * @param optional * Original value - * @return + * @return Optional object with type argument casted as cls */ private static Optional castOptional(final Class cls, final Optional optional) { if (optional.isPresent()) { @@ -453,6 +487,7 @@ public final class BuilderUtils { return Optional.absent(); } + // FIXME: if rpc does not define input or output, this method creates it /** * * Gets input / output container from {@link RpcDefinitionBuilder} if QName @@ -466,10 +501,27 @@ public final class BuilderUtils { * @return Optional of input/output if defined and QName is input/output. * Otherwise {@link Optional#absent()}. */ - private static Optional findContainerInRpc(final RpcDefinitionBuilder parent, final QName child) { + private static Optional findContainerInRpc(final RpcDefinitionBuilder parent, + final QName child) { if (INPUT.equals(child.getLocalName())) { + if (parent.getInput() == null) { + QName qname = QName.create(parent.getQName().getModule(), "input"); + final ContainerSchemaNodeBuilder inputBuilder = new ContainerSchemaNodeBuilder(parent.getModuleName(), + parent.getLine(), qname, parent.getPath().createChild(qname)); + inputBuilder.setParent(parent); + parent.setInput(inputBuilder); + return Optional.of(inputBuilder); + } return Optional.of(parent.getInput()); } else if (OUTPUT.equals(child.getLocalName())) { + if (parent.getOutput() == null) { + QName qname = QName.create(parent.getQName().getModule(), "output"); + final ContainerSchemaNodeBuilder outputBuilder = new ContainerSchemaNodeBuilder(parent.getModuleName(), + parent.getLine(), qname, parent.getPath().createChild(qname)); + outputBuilder.setParent(parent); + parent.setOutput(outputBuilder); + return Optional.of(outputBuilder); + } return Optional.of(parent.getOutput()); } LOG.trace("Child {} not found in node {}", child, parent); @@ -582,18 +634,20 @@ public final class BuilderUtils { * Find augment target node and perform augmentation. * * @param augment + * augment builder to process * @param firstNodeParent * parent of first node in path - * @param path - * path to augment target * @return true if augmentation process succeed, false otherwise */ public static boolean processAugmentation(final AugmentationSchemaBuilder augment, final ModuleBuilder firstNodeParent) { - Optional potentialTargetNode = findSchemaNodeInModule(augment.getTargetNodeSchemaPath(), + Optional potentialTargetNode = findSchemaNodeInModule(augment.getTargetPath(), firstNodeParent); if (!potentialTargetNode.isPresent()) { return false; + } else if (potentialTargetNode.get() instanceof UnknownSchemaNodeBuilder) { + LOG.warn("Error in augment parsing: unsupported augment target: {}", potentialTargetNode.get()); + return true; } SchemaNodeBuilder targetNode = potentialTargetNode.get(); fillAugmentTarget(augment, targetNode); @@ -604,8 +658,8 @@ public final class BuilderUtils { return true; } - public static IdentitySchemaNodeBuilder findBaseIdentity(final Map> modules, - final ModuleBuilder module, final String baseString, final int line) { + public static IdentitySchemaNodeBuilder findBaseIdentity(final ModuleBuilder module, final String baseString, + final int line) { // FIXME: optimize indexOf() away? if (baseString.indexOf(':') != -1) { @@ -660,8 +714,8 @@ public final class BuilderUtils { } public static Set wrapChildNodes(final String moduleName, final int line, - final Set nodes, final SchemaPath parentPath, final QName parentQName) { - Set result = new HashSet<>(); + final Collection nodes, final SchemaPath parentPath, final QName parentQName) { + Set result = new LinkedHashSet<>(nodes.size()); for (DataSchemaNode node : nodes) { QName qname = QName.create(parentQName, node.getQName().getLocalName()); @@ -745,7 +799,7 @@ public final class BuilderUtils { } } - public static ModuleBuilder getModuleByPrefix(ModuleBuilder module, String prefix) { + public static ModuleBuilder getModuleByPrefix(final ModuleBuilder module, final String prefix) { if (prefix == null || prefix.isEmpty() || prefix.equals(module.getPrefix())) { return module; } else { @@ -753,4 +807,107 @@ public final class BuilderUtils { } } + public static ModuleBuilder findModule(final QName qname, final Map> modules) { + TreeMap map = modules.get(qname.getNamespace()); + if (map == null) { + return null; + } + if (qname.getRevision() == null) { + return map.lastEntry().getValue(); + } + return map.get(qname.getRevision()); + } + + public static Map> createYangNamespaceContext( + final Collection modules, final Optional context) { + Map> namespaceContext = new HashMap<>(); + Set submodules = new HashSet<>(); + // first read ParseTree collection and separate modules and submodules + for (ParseTree module : modules) { + for (int i = 0; i < module.getChildCount(); i++) { + ParseTree moduleTree = module.getChild(i); + if (moduleTree instanceof Submodule_stmtContext) { + // put submodule context to separate collection + submodules.add((Submodule_stmtContext) moduleTree); + } else if (moduleTree instanceof Module_stmtContext) { + // get name, revision and namespace from module + Module_stmtContext moduleCtx = (Module_stmtContext) moduleTree; + final String moduleName = ParserListenerUtils.stringFromNode(moduleCtx); + Date rev = null; + URI namespace = null; + for (int j = 0; j < moduleCtx.getChildCount(); j++) { + ParseTree moduleCtxChildTree = moduleCtx.getChild(j); + if (moduleCtxChildTree instanceof Revision_stmtsContext) { + String revisionDateStr = YangModelDependencyInfo + .getLatestRevision((Revision_stmtsContext) moduleCtxChildTree); + if (revisionDateStr == null) { + rev = new Date(0); + } else { + rev = QName.parseRevision(revisionDateStr); + } + } + if (moduleCtxChildTree instanceof Module_header_stmtsContext) { + Module_header_stmtsContext headerCtx = (Module_header_stmtsContext) moduleCtxChildTree; + for (int k = 0; k < headerCtx.getChildCount(); k++) { + ParseTree ctx = headerCtx.getChild(k); + if (ctx instanceof Namespace_stmtContext) { + final String namespaceStr = ParserListenerUtils.stringFromNode(ctx); + namespace = URI.create(namespaceStr); + break; + } + } + } + } + // update namespaceContext + TreeMap revToNs = namespaceContext.get(moduleName); + if (revToNs == null) { + revToNs = new TreeMap<>(); + revToNs.put(rev, namespace); + namespaceContext.put(moduleName, revToNs); + } + revToNs.put(rev, namespace); + } + } + } + // after all ParseTree-s are parsed update namespaceContext with modules + // from SchemaContext + if (context.isPresent()) { + for (Module module : context.get().getModules()) { + TreeMap revToNs = namespaceContext.get(module.getName()); + if (revToNs == null) { + revToNs = new TreeMap<>(); + revToNs.put(module.getRevision(), module.getNamespace()); + namespaceContext.put(module.getName(), revToNs); + } + revToNs.put(module.getRevision(), module.getNamespace()); + } + } + // when all modules are processed, traverse submodules and update + // namespaceContext with mapping for submodules + for (Submodule_stmtContext submodule : submodules) { + final String moduleName = ParserListenerUtils.stringFromNode(submodule); + for (int i = 0; i < submodule.getChildCount(); i++) { + ParseTree subHeaderCtx = submodule.getChild(i); + if (subHeaderCtx instanceof Submodule_header_stmtsContext) { + for (int j = 0; j < subHeaderCtx.getChildCount(); j++) { + ParseTree belongsCtx = subHeaderCtx.getChild(j); + if (belongsCtx instanceof Belongs_to_stmtContext) { + final String belongsTo = ParserListenerUtils.stringFromNode(belongsCtx); + TreeMap ns = namespaceContext.get(belongsTo); + if (ns == null) { + throw new YangParseException(moduleName, submodule.getStart().getLine(), String.format( + "Unresolved belongs-to statement: %s", belongsTo)); + } + // submodule get namespace and revision from module + TreeMap subNs = new TreeMap<>(); + subNs.put(ns.firstKey(), ns.firstEntry().getValue()); + namespaceContext.put(moduleName, subNs); + } + } + } + } + } + return namespaceContext; + } + }