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%2Fbuilder%2Fimpl%2FBuilderUtils.java;h=792db8d9c84b8a1a677df8511343fa097565845b;hb=42abb28b99a02f9580f4676ce5c315628e5bcd24;hp=759e779eed26e29a079b7e37681515022e8a160a;hpb=2ed9cc983125bb33a21534c8c550a38483e2a8dd;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 759e779eed..792db8d9c8 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 @@ -14,7 +14,7 @@ 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 com.google.common.io.ByteStreams; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; @@ -29,10 +29,11 @@ import java.util.Iterator; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; +import java.util.Map.Entry; +import java.util.NavigableMap; 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; @@ -43,7 +44,7 @@ import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Submodule_stmtCont import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; -import org.opendaylight.yangtools.yang.model.api.ChoiceNode; +import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; @@ -77,6 +78,10 @@ import org.opendaylight.yangtools.yang.parser.util.YangParseException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated public final class BuilderUtils { private static final Logger LOG = LoggerFactory.getLogger(BuilderUtils.class); @@ -84,6 +89,7 @@ public final class BuilderUtils { private static final Date NULL_DATE = new Date(0L); private static final String INPUT = "input"; private static final String OUTPUT = "output"; + private static final String CHILD_NOT_FOUND_IN_NODE_STR = "Child {} not found in node {}"; private BuilderUtils() { } @@ -120,22 +126,6 @@ public final class BuilderUtils { }); } - /** - * Create new SchemaPath from given path and qname. - * - * @param schemaPath - * base path - * @param qname - * one or more qnames added to base path - * @return new SchemaPath from given path and qname - * - * @deprecated Use {@link SchemaPath#createChild(QName...)} instead. - */ - @Deprecated - public static SchemaPath createSchemaPath(final SchemaPath schemaPath, final QName... qname) { - return schemaPath.createChild(qname); - } - /** * Find dependent module based on given prefix * @@ -149,7 +139,7 @@ public final class BuilderUtils { * current line in yang model * @return module builder if found, null otherwise */ - public static ModuleBuilder findModuleFromBuilders(final Map> modules, + public static ModuleBuilder findModuleFromBuilders(final Map> modules, final ModuleBuilder module, final String prefix, final int line) { ModuleBuilder dependentModule; Date dependentModuleRevision; @@ -166,7 +156,7 @@ public final class BuilderUtils { String dependentModuleName = dependentModuleImport.getModuleName(); dependentModuleRevision = dependentModuleImport.getRevision(); - TreeMap moduleBuildersByRevision = modules.get(dependentModuleName); + NavigableMap moduleBuildersByRevision = modules.get(dependentModuleName); if (moduleBuildersByRevision == null) { return null; } @@ -179,15 +169,13 @@ public final class BuilderUtils { return dependentModule; } - public static ModuleBuilder findModuleFromBuilders(ModuleImport imp, Iterable modules) { + public static ModuleBuilder findModuleFromBuilders(final ModuleImport imp, final Iterable modules) { String name = imp.getModuleName(); Date revision = imp.getRevision(); - TreeMap map = new TreeMap<>(); + NavigableMap map = new TreeMap<>(); for (ModuleBuilder module : modules) { - if (module != null) { - if (module.getName().equals(name)) { - map.put(module.getRevision(), module); - } + if (module != null && module.getName().equals(name)) { + map.put(module.getRevision(), module); } } if (map.isEmpty()) { @@ -217,7 +205,7 @@ public final class BuilderUtils { */ public static Module findModuleFromContext(final SchemaContext context, final ModuleBuilder currentModule, final String prefix, final int line) { - TreeMap modulesByRevision = new TreeMap<>(); + NavigableMap modulesByRevision = new TreeMap<>(); ModuleImport dependentModuleImport = currentModule.getImport(prefix); if (dependentModuleImport == null) { @@ -344,7 +332,7 @@ public final class BuilderUtils { /** * Set addedByUses flag to true for node and all its child nodes. * - * @param node + * @param node grouping member node */ public static void setNodeAddedByUses(final GroupingMember node) { node.setAddedByUses(true); @@ -361,6 +349,41 @@ public final class BuilderUtils { } } + /** + * Find builder of schema node under parent builder (including under + * AugmentationSchemaBuilder). + * + * @param path + * - path of target schema node builder + * @param parent + * - base data node container builder under which the target + * schema node builder should be found + * @return builder of schema node + */ + public static SchemaNodeBuilder findTargetNode(final Iterable path, + final DataNodeContainerBuilder parent) { + + Preconditions.checkNotNull(parent); + Preconditions.checkNotNull(path); + + SchemaNodeBuilder foundNode = null; + + final Iterator pathIterator = path.iterator(); + if (pathIterator.hasNext()) { + String name = pathIterator.next().getLocalName(); + foundNode = parent.getDataChildByName(name); + if (foundNode == null) { + foundNode = findUnknownNode(name, parent); + } + } + + if (pathIterator.hasNext() && foundNode != null) { + return findSchemaNode(Iterables.skip(path, 1), foundNode); + } else { + return foundNode; + } + } + public static SchemaNodeBuilder findSchemaNode(final Iterable path, final SchemaNodeBuilder parentNode) { SchemaNodeBuilder node = null; SchemaNodeBuilder parent = parentNode; @@ -379,9 +402,9 @@ public final class BuilderUtils { node = findUnknownNode(name, parent); } } else if (parent instanceof RpcDefinitionBuilder) { - if ("input".equals(name)) { + if (INPUT.equals(name)) { node = ((RpcDefinitionBuilder) parent).getInput(); - } else if ("output".equals(name)) { + } else if (OUTPUT.equals(name)) { node = ((RpcDefinitionBuilder) parent).getOutput(); } else { if (node == null) { @@ -458,9 +481,8 @@ public final class BuilderUtils { return castOptional(SchemaNodeBuilder.class, findCaseInChoice((ChoiceBuilder) parent, child)); } else if (parent instanceof RpcDefinitionBuilder) { return castOptional(SchemaNodeBuilder.class, findContainerInRpc((RpcDefinitionBuilder) parent, child)); - } else { - LOG.trace("Child {} not found in node {}", child, parent); + LOG.trace(CHILD_NOT_FOUND_IN_NODE_STR, child, parent); return Optional.absent(); } } @@ -505,7 +527,7 @@ public final class BuilderUtils { final QName child) { if (INPUT.equals(child.getLocalName())) { if (parent.getInput() == null) { - QName qname = QName.create(parent.getQName().getModule(), "input"); + 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); @@ -515,7 +537,7 @@ public final class BuilderUtils { return Optional.of(parent.getInput()); } else if (OUTPUT.equals(child.getLocalName())) { if (parent.getOutput() == null) { - QName qname = QName.create(parent.getQName().getModule(), "output"); + 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); @@ -524,7 +546,7 @@ public final class BuilderUtils { } return Optional.of(parent.getOutput()); } - LOG.trace("Child {} not found in node {}", child, parent); + LOG.trace(CHILD_NOT_FOUND_IN_NODE_STR, child, parent); return Optional.absent(); } @@ -545,7 +567,7 @@ public final class BuilderUtils { return Optional.of(caze); } } - LOG.trace("Child {} not found in node {}", child, parent); + LOG.trace(CHILD_NOT_FOUND_IN_NODE_STR, child, parent); return Optional.absent(); } @@ -566,7 +588,7 @@ public final class BuilderUtils { return Optional.of(childNode); } } - LOG.trace("Child {} not found in node {}", child, parent); + LOG.trace(CHILD_NOT_FOUND_IN_NODE_STR, child, parent); return Optional.absent(); } @@ -626,7 +648,7 @@ public final class BuilderUtils { return Optional. of(childNode); } } - LOG.trace("Child {} not found in node {}", child, builder); + LOG.trace(CHILD_NOT_FOUND_IN_NODE_STR, child, builder); return Optional.absent(); } @@ -695,7 +717,7 @@ public final class BuilderUtils { /** * Get module in which this node is defined. * - * @param node + * @param node node * @return builder of module where this node is defined */ public static ModuleBuilder getParentModule(final Builder node) { @@ -731,19 +753,19 @@ public final class BuilderUtils { final SchemaPath schemaPath = parentPath.createChild(qname); if (node instanceof AnyXmlSchemaNode) { - return new AnyXmlBuilder(moduleName, line, qname, schemaPath, ((AnyXmlSchemaNode) node)); - } else if (node instanceof ChoiceNode) { - return new ChoiceBuilder(moduleName, line, qname, schemaPath, ((ChoiceNode) node)); + return new AnyXmlBuilder(moduleName, line, qname, schemaPath, (AnyXmlSchemaNode) node); + } else if (node instanceof ChoiceSchemaNode) { + return new ChoiceBuilder(moduleName, line, qname, schemaPath, (ChoiceSchemaNode) node); } else if (node instanceof ContainerSchemaNode) { - return new ContainerSchemaNodeBuilder(moduleName, line, qname, schemaPath, ((ContainerSchemaNode) node)); + return new ContainerSchemaNodeBuilder(moduleName, line, qname, schemaPath, (ContainerSchemaNode) node); } else if (node instanceof LeafSchemaNode) { - return new LeafSchemaNodeBuilder(moduleName, line, qname, schemaPath, ((LeafSchemaNode) node)); + return new LeafSchemaNodeBuilder(moduleName, line, qname, schemaPath, (LeafSchemaNode) node); } else if (node instanceof LeafListSchemaNode) { - return new LeafListSchemaNodeBuilder(moduleName, line, qname, schemaPath, ((LeafListSchemaNode) node)); + return new LeafListSchemaNodeBuilder(moduleName, line, qname, schemaPath, (LeafListSchemaNode) node); } else if (node instanceof ListSchemaNode) { - return new ListSchemaNodeBuilder(moduleName, line, qname, schemaPath, ((ListSchemaNode) node)); + return new ListSchemaNodeBuilder(moduleName, line, qname, schemaPath, (ListSchemaNode) node); } else if (node instanceof ChoiceCaseNode) { - return new ChoiceCaseBuilder(moduleName, line, qname, schemaPath, ((ChoiceCaseNode) node)); + return new ChoiceCaseBuilder(moduleName, line, qname, schemaPath, (ChoiceCaseNode) node); } else { throw new YangParseException(moduleName, line, "Failed to copy node: Unknown type of DataSchemaNode: " + node); @@ -768,7 +790,7 @@ public final class BuilderUtils { for (TypeDefinition node : nodes) { QName qname = QName.create(parentQName, node.getQName().getLocalName()); SchemaPath schemaPath = parentPath.createChild(qname); - result.add(new TypeDefinitionBuilderImpl(moduleName, line, qname, schemaPath, ((ExtendedType) node))); + result.add(new TypeDefinitionBuilderImpl(moduleName, line, qname, schemaPath, (ExtendedType) node)); } return result; } @@ -786,16 +808,16 @@ public final class BuilderUtils { private static final class ByteSourceImpl extends ByteSource { private final String toString; - private final ByteArrayOutputStream output = new ByteArrayOutputStream(); + private final byte[] data; private ByteSourceImpl(final InputStream input) throws IOException { toString = input.toString(); - IOUtils.copy(input, output); + data = ByteStreams.toByteArray(input); } @Override public InputStream openStream() throws IOException { - return new NamedByteArrayInputStream(output.toByteArray(), toString); + return new NamedByteArrayInputStream(data, toString); } } @@ -807,20 +829,40 @@ public final class BuilderUtils { } } - public static ModuleBuilder findModule(final QName qname, final Map> modules) { - TreeMap map = modules.get(qname.getNamespace()); + public static ModuleBuilder findModule(final QName qname, final Map> modules) { + NavigableMap map = modules.get(qname.getNamespace()); if (map == null) { return null; } if (qname.getRevision() == null) { return map.lastEntry().getValue(); } + + final Entry lastEntry = map.lastEntry(); + if (qname.getRevision().compareTo(lastEntry.getKey()) > 0) { + /* + * We are trying to find more recent revision of module than is in + * the map. Most probably the yang models are not referenced + * correctly and the revision of a base module or submodule has not + * been updated along with revision of a referenced module or + * submodule. However, we should return the most recent entry in the + * map, otherwise the null pointer exception occurs (see Bug3799). + */ + LOG.warn(String + .format("Attempt to find more recent revision of module than is available. " + + "The requested revision is [%s], but the most recent available revision of module is [%s]." + + " Most probably some of Yang models do not have updated revision or they are not " + + "referenced correctly.", + qname.getRevision(), lastEntry.getKey())); + return lastEntry.getValue(); + } + return map.get(qname.getRevision()); } - public static Map> createYangNamespaceContext( + public static Map> createYangNamespaceContext( final Collection modules, final Optional context) { - Map> namespaceContext = new HashMap<>(); + Map> namespaceContext = new HashMap<>(); Set submodules = new HashSet<>(); // first read ParseTree collection and separate modules and submodules for (ParseTree module : modules) { @@ -859,7 +901,7 @@ public final class BuilderUtils { } } // update namespaceContext - TreeMap revToNs = namespaceContext.get(moduleName); + NavigableMap revToNs = namespaceContext.get(moduleName); if (revToNs == null) { revToNs = new TreeMap<>(); revToNs.put(rev, namespace); @@ -873,7 +915,7 @@ public final class BuilderUtils { // from SchemaContext if (context.isPresent()) { for (Module module : context.get().getModules()) { - TreeMap revToNs = namespaceContext.get(module.getName()); + NavigableMap revToNs = namespaceContext.get(module.getName()); if (revToNs == null) { revToNs = new TreeMap<>(); revToNs.put(module.getRevision(), module.getNamespace()); @@ -893,13 +935,13 @@ public final class BuilderUtils { ParseTree belongsCtx = subHeaderCtx.getChild(j); if (belongsCtx instanceof Belongs_to_stmtContext) { final String belongsTo = ParserListenerUtils.stringFromNode(belongsCtx); - TreeMap ns = namespaceContext.get(belongsTo); + NavigableMap 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<>(); + NavigableMap subNs = new TreeMap<>(); subNs.put(ns.firstKey(), ns.firstEntry().getValue()); namespaceContext.put(moduleName, subNs); }