X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fsal%2Fyang-prototype%2Fcode-generator%2Fyang-model-parser-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fyang%2Fmodel%2Fparser%2Fimpl%2FYangModelParserImpl.java;h=60937fff22dcac74e7d9ab24e891f9d066495c82;hb=071db48e47fa3dd83da3933f1b35c3ca0d42f550;hp=946bfb429699ef1d3133b5f3ca0ad7e222b1fa08;hpb=bc395f78e1b7092d51348b8acac4cc83c90ab9ba;p=controller.git diff --git a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/model/parser/impl/YangModelParserImpl.java b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/model/parser/impl/YangModelParserImpl.java index 946bfb4296..60937fff22 100644 --- a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/model/parser/impl/YangModelParserImpl.java +++ b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/model/parser/impl/YangModelParserImpl.java @@ -18,8 +18,10 @@ import java.util.Collections; import java.util.Date; import java.util.HashMap; import java.util.HashSet; +import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.NoSuchElementException; import java.util.Set; import java.util.TreeMap; @@ -61,19 +63,22 @@ import org.opendaylight.controller.yang.model.parser.builder.impl.AnyXmlBuilder; import org.opendaylight.controller.yang.model.parser.builder.impl.ChoiceBuilder; import org.opendaylight.controller.yang.model.parser.builder.impl.ContainerSchemaNodeBuilder; import org.opendaylight.controller.yang.model.parser.builder.impl.IdentitySchemaNodeBuilder; +import org.opendaylight.controller.yang.model.parser.builder.impl.IdentityrefTypeBuilder; import org.opendaylight.controller.yang.model.parser.builder.impl.LeafListSchemaNodeBuilder; import org.opendaylight.controller.yang.model.parser.builder.impl.LeafSchemaNodeBuilder; import org.opendaylight.controller.yang.model.parser.builder.impl.ListSchemaNodeBuilder; import org.opendaylight.controller.yang.model.parser.builder.impl.ModuleBuilder; import org.opendaylight.controller.yang.model.parser.builder.impl.TypedefBuilder; import org.opendaylight.controller.yang.model.parser.builder.impl.UnionTypeBuilder; +import org.opendaylight.controller.yang.model.parser.builder.impl.UnknownSchemaNodeBuilder; import org.opendaylight.controller.yang.model.parser.util.ParserUtils; import org.opendaylight.controller.yang.model.parser.util.RefineHolder; -import org.opendaylight.controller.yang.model.parser.util.RefineHolder.Refine; import org.opendaylight.controller.yang.model.parser.util.TypeConstraints; import org.opendaylight.controller.yang.model.parser.util.YangParseException; import org.opendaylight.controller.yang.model.util.ExtendedType; +import org.opendaylight.controller.yang.model.util.IdentityrefType; import org.opendaylight.controller.yang.model.util.UnknownType; +import org.opendaylight.controller.yang.model.validator.YangModelBasicValidator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -83,21 +88,27 @@ public class YangModelParserImpl implements YangModelParser { .getLogger(YangModelParserImpl.class); @Override - public Module parseYangModel(final String yangFile) { - final Map> modules = resolveModuleBuilders(yangFile); - final Set result = build(modules); - return result.iterator().next(); - } - - @Override - public Set parseYangModels(final String... yangFiles) { - final Map> modules = resolveModuleBuilders(yangFiles); - return build(modules); + public Set parseYangModels(final List yangFiles) { + if (yangFiles != null) { + final List inputStreams = new ArrayList(); + + for (final File yangFile : yangFiles) { + try { + inputStreams.add(new FileInputStream(yangFile)); + } catch (FileNotFoundException e) { + logger.warn("Exception while reading yang file: " + + yangFile.getName(), e); + } + } + final Map> modules = resolveModuleBuilders(inputStreams); + return build(modules); + } + return Collections.emptySet(); } @Override public Set parseYangModelsFromStreams( - final InputStream... yangModelStreams) { + final List yangModelStreams) { final Map> modules = resolveModuleBuilders(yangModelStreams); return build(modules); } @@ -108,69 +119,14 @@ public class YangModelParserImpl implements YangModelParser { } private Map> resolveModuleBuilders( - final String... yangFiles) { - final InputStream[] streams = loadStreams(yangFiles); - Map> result = Collections - .emptyMap(); - - if (streams != null) { - result = resolveModuleBuilders(streams); - closeStreams(streams); - } - return result; - } - - private InputStream[] loadStreams(final String... yangFiles) { - final InputStream[] streams = new InputStream[yangFiles.length]; - for (int i = 0; i < yangFiles.length; i++) { - final String yangFileName = yangFiles[i]; - final File yangFile = new File(yangFileName); - try { - streams[i] = new FileInputStream(yangFile); - } catch (FileNotFoundException e) { - logger.warn("Exception while reading yang stream: " - + streams[i], e); - } - } - return streams; - } - - private void closeStreams(final InputStream[] streams) { - if (streams != null) { - for (int i = 0; i < streams.length; i++) { - try { - if (streams[i] != null) { - streams[i].close(); - } - } catch (IOException e) { - logger.warn("Exception while closing yang stream: " - + streams[i], e); - } - } - } - } - - private Map> resolveModuleBuilders( - final InputStream... yangFiles) { + final List yangFileStreams) { final Map> modules = new HashMap>(); final ParseTreeWalker walker = new ParseTreeWalker(); - final List trees = parseStreams(yangFiles); + final List trees = parseStreams(yangFileStreams); final ModuleBuilder[] builders = new ModuleBuilder[trees.size()]; - // validation - // if validation fails with any file, do not continue and throw - // exception - for (int i = 0; i < trees.size(); i++) { - try { - final YangModelValidationListener yangModelParser = new YangModelValidationListener(); - walker.walk(yangModelParser, trees.get(i)); - } catch (IllegalStateException e) { - // wrap exception to add information about which file failed - throw new YangValidationException( - "Yang validation failed for file" + yangFiles[i], e); - } - } - + // validate yang + new YangModelBasicValidator(walker).validate(trees); YangModelParserListenerImpl yangModelParser = null; for (int i = 0; i < trees.size(); i++) { @@ -196,7 +152,7 @@ public class YangModelParserImpl implements YangModelParser { return modules; } - private List parseStreams(final InputStream... yangStreams) { + private List parseStreams(final List yangStreams) { final List trees = new ArrayList(); for (InputStream yangStream : yangStreams) { trees.add(parseStream(yangStream)); @@ -218,16 +174,18 @@ public class YangModelParserImpl implements YangModelParser { return result; } - private Set build(final Map> modules) { - // validate + private Set build( + final Map> modules) { + // fix unresolved nodes for (Map.Entry> entry : modules .entrySet()) { for (Map.Entry childEntry : entry.getValue() .entrySet()) { final ModuleBuilder moduleBuilder = childEntry.getValue(); - validateModule(modules, moduleBuilder); + fixUnresolvedNodes(modules, moduleBuilder); } } + resolveAugments(modules); // build final Set result = new HashSet(); @@ -245,11 +203,10 @@ public class YangModelParserImpl implements YangModelParser { return result; } - private void validateModule( - Map> modules, - ModuleBuilder builder) { + private void fixUnresolvedNodes( + final Map> modules, + final ModuleBuilder builder) { resolveDirtyNodes(modules, builder); - resolveAugments(modules, builder); resolveIdentities(modules, builder); resolveUses(modules, builder); } @@ -264,8 +221,8 @@ public class YangModelParserImpl implements YangModelParser { * current module */ private void resolveDirtyNodes( - Map> modules, - ModuleBuilder module) { + final Map> modules, + final ModuleBuilder module) { final Map, TypeAwareBuilder> dirtyNodes = module .getDirtyNodes(); if (!dirtyNodes.isEmpty()) { @@ -276,20 +233,25 @@ public class YangModelParserImpl implements YangModelParser { // different handling for union types if (nodeToResolve instanceof UnionTypeBuilder) { final UnionTypeBuilder union = (UnionTypeBuilder) nodeToResolve; - List> unionTypes = union.getTypes(); - List toRemove = new ArrayList(); + final List> unionTypes = union.getTypes(); + final List toRemove = new ArrayList(); for (TypeDefinition td : unionTypes) { if (td instanceof UnknownType) { - UnknownType unknownType = (UnknownType) td; - TypeDefinitionBuilder resolvedType = resolveTypeUnion( + final UnknownType unknownType = (UnknownType) td; + final TypeDefinitionBuilder resolvedType = resolveTypeUnion( nodeToResolve, unknownType, modules, module); union.setType(resolvedType); toRemove.add(unknownType); } } unionTypes.removeAll(toRemove); + } else if (nodeToResolve.getTypedef() instanceof IdentityrefTypeBuilder) { + IdentityrefTypeBuilder idref = (IdentityrefTypeBuilder) nodeToResolve + .getTypedef(); + nodeToResolve.setType(new IdentityrefType(findFullQName( + modules, module, idref), idref.getPath())); } else { - TypeDefinitionBuilder resolvedType = resolveType( + final TypeDefinitionBuilder resolvedType = resolveType( nodeToResolve, modules, module); nodeToResolve.setType(resolvedType); } @@ -297,14 +259,15 @@ public class YangModelParserImpl implements YangModelParser { } } - private TypeDefinitionBuilder resolveType(TypeAwareBuilder typeToResolve, - Map> modules, - ModuleBuilder builder) { - TypeConstraints constraints = new TypeConstraints(); + private TypeDefinitionBuilder resolveType( + final TypeAwareBuilder typeToResolve, + final Map> modules, + final ModuleBuilder builder) { + final TypeConstraints constraints = new TypeConstraints(); - TypeDefinitionBuilder targetType = getTypedefBuilder(typeToResolve, - modules, builder); - TypeConstraints tConstraints = findConstraints(typeToResolve, + final TypeDefinitionBuilder targetType = getTypedefBuilder( + typeToResolve, modules, builder); + final TypeConstraints tConstraints = findConstraints(typeToResolve, constraints, modules, builder); targetType.setRanges(tConstraints.getRange()); targetType.setLengths(tConstraints.getLength()); @@ -315,14 +278,15 @@ public class YangModelParserImpl implements YangModelParser { } private TypeDefinitionBuilder resolveTypeUnion( - TypeAwareBuilder typeToResolve, UnknownType unknownType, - Map> modules, - ModuleBuilder builder) { - TypeConstraints constraints = new TypeConstraints(); + final TypeAwareBuilder typeToResolve, + final UnknownType unknownType, + final Map> modules, + final ModuleBuilder builder) { + final TypeConstraints constraints = new TypeConstraints(); - TypeDefinitionBuilder targetType = getUnionBuilder(typeToResolve, + final TypeDefinitionBuilder targetType = getUnionBuilder(typeToResolve, unknownType, modules, builder); - TypeConstraints tConstraints = findConstraints(typeToResolve, + final TypeConstraints tConstraints = findConstraints(typeToResolve, constraints, modules, builder); targetType.setRanges(tConstraints.getRange()); targetType.setLengths(tConstraints.getLength()); @@ -333,68 +297,65 @@ public class YangModelParserImpl implements YangModelParser { } private TypeDefinitionBuilder getTypedefBuilder( - TypeAwareBuilder nodeToResolve, - Map> modules, - ModuleBuilder builder) { + final TypeAwareBuilder nodeToResolve, + final Map> modules, + final ModuleBuilder builder) { - TypeDefinition nodeToResolveBase = nodeToResolve.getType(); + final TypeDefinition nodeToResolveBase = nodeToResolve.getType(); if (nodeToResolveBase != null && !(nodeToResolveBase instanceof UnknownType)) { return (TypeDefinitionBuilder) nodeToResolve; } - UnknownType unknownType = (UnknownType) nodeToResolve.getType(); - - QName unknownTypeQName = unknownType.getQName(); - String unknownTypeName = unknownTypeQName.getLocalName(); - String unknownTypePrefix = unknownTypeQName.getPrefix(); + final UnknownType unknownType = (UnknownType) nodeToResolve.getType(); + final QName unknownTypeQName = unknownType.getQName(); // search for module which contains referenced typedef - ModuleBuilder dependentModule = findDependentModule(modules, builder, - unknownTypePrefix); - TypeDefinitionBuilder lookedUpBuilder = findTypedefBuilderByName( - dependentModule, unknownTypeName); + final ModuleBuilder dependentModule = findDependentModule(modules, + builder, unknownTypeQName.getPrefix()); + final TypeDefinitionBuilder lookedUpBuilder = findTypedefBuilderByName( + dependentModule, unknownTypeQName.getLocalName()); - TypeDefinitionBuilder lookedUpBuilderCopy = copyTypedefBuilder( + final TypeDefinitionBuilder lookedUpBuilderCopy = copyTypedefBuilder( lookedUpBuilder, nodeToResolve instanceof TypeDefinitionBuilder); - TypeDefinitionBuilder resolvedCopy = resolveCopiedBuilder( + final TypeDefinitionBuilder resolvedCopy = resolveCopiedBuilder( lookedUpBuilderCopy, modules, dependentModule); return resolvedCopy; } private TypeDefinitionBuilder getUnionBuilder( - TypeAwareBuilder nodeToResolve, UnknownType unknownType, - Map> modules, - ModuleBuilder module) { + final TypeAwareBuilder nodeToResolve, + final UnknownType unknownType, + final Map> modules, + final ModuleBuilder module) { - TypeDefinition baseTypeToResolve = nodeToResolve.getType(); + final TypeDefinition baseTypeToResolve = nodeToResolve.getType(); if (baseTypeToResolve != null && !(baseTypeToResolve instanceof UnknownType)) { return (TypeDefinitionBuilder) nodeToResolve; } - QName unknownTypeQName = unknownType.getQName(); - String unknownTypeName = unknownTypeQName.getLocalName(); - String unknownTypePrefix = unknownTypeQName.getPrefix(); - + final QName unknownTypeQName = unknownType.getQName(); // search for module which contains referenced typedef - ModuleBuilder dependentModule = findDependentModule(modules, module, - unknownTypePrefix); - TypeDefinitionBuilder lookedUpBuilder = findTypedefBuilderByName( - dependentModule, unknownTypeName); + final ModuleBuilder dependentModule = findDependentModule(modules, + module, unknownTypeQName.getPrefix()); + final TypeDefinitionBuilder lookedUpBuilder = findTypedefBuilderByName( + dependentModule, unknownTypeQName.getLocalName()); - TypeDefinitionBuilder lookedUpBuilderCopy = copyTypedefBuilder( + final TypeDefinitionBuilder lookedUpBuilderCopy = copyTypedefBuilder( lookedUpBuilder, nodeToResolve instanceof TypeDefinitionBuilder); - TypeDefinitionBuilder resolvedCopy = resolveCopiedBuilder( + final TypeDefinitionBuilder resolvedCopy = resolveCopiedBuilder( lookedUpBuilderCopy, modules, dependentModule); return resolvedCopy; } - private TypeDefinitionBuilder copyTypedefBuilder(TypeDefinitionBuilder old, - boolean seekByTypedefBuilder) { + private TypeDefinitionBuilder copyTypedefBuilder( + final TypeDefinitionBuilder old, final boolean seekByTypedefBuilder) { if (old instanceof UnionTypeBuilder) { - UnionTypeBuilder oldUnion = (UnionTypeBuilder) old; - UnionTypeBuilder newUnion = new UnionTypeBuilder(); + final UnionTypeBuilder oldUnion = (UnionTypeBuilder) old; + final UnionTypeBuilder newUnion = new UnionTypeBuilder( + oldUnion.getActualPath(), oldUnion.getNamespace(), + oldUnion.getRevision()); for (TypeDefinition td : oldUnion.getTypes()) { newUnion.setType(td); } @@ -404,18 +365,19 @@ public class YangModelParserImpl implements YangModelParser { return newUnion; } - QName oldName = old.getQName(); - QName newName = new QName(oldName.getNamespace(), + final QName oldName = old.getQName(); + final QName newName = new QName(oldName.getNamespace(), oldName.getRevision(), oldName.getPrefix(), oldName.getLocalName()); - TypeDefinitionBuilder tdb = new TypedefBuilder(newName); + final TypeDefinitionBuilder tdb = new TypedefBuilder(newName); tdb.setRanges(old.getRanges()); tdb.setLengths(old.getLengths()); tdb.setPatterns(old.getPatterns()); tdb.setFractionDigits(old.getFractionDigits()); - - TypeDefinition oldType = old.getType(); + tdb.setPath(old.getPath()); + + final TypeDefinition oldType = old.getType(); if (oldType == null) { tdb.setType(old.getTypedef()); } else { @@ -433,18 +395,18 @@ public class YangModelParserImpl implements YangModelParser { } private TypeDefinitionBuilder resolveCopiedBuilder( - TypeDefinitionBuilder copy, - Map> modules, - ModuleBuilder builder) { + final TypeDefinitionBuilder copy, + final Map> modules, + final ModuleBuilder builder) { if (copy instanceof UnionTypeBuilder) { - UnionTypeBuilder union = (UnionTypeBuilder) copy; - List> unionTypes = union.getTypes(); - List toRemove = new ArrayList(); + final UnionTypeBuilder union = (UnionTypeBuilder) copy; + final List> unionTypes = union.getTypes(); + final List toRemove = new ArrayList(); for (TypeDefinition td : unionTypes) { if (td instanceof UnknownType) { - UnknownType unknownType = (UnknownType) td; - TypeDefinitionBuilder resolvedType = resolveTypeUnion( + final UnknownType unknownType = (UnknownType) td; + final TypeDefinitionBuilder resolvedType = resolveTypeUnion( union, unknownType, modules, builder); union.setType(resolvedType); toRemove.add(unknownType); @@ -455,57 +417,51 @@ public class YangModelParserImpl implements YangModelParser { return union; } - TypeDefinition base = copy.getType(); - TypeDefinitionBuilder baseTdb = copy.getTypedef(); + final TypeDefinition base = copy.getType(); + final TypeDefinitionBuilder baseTdb = copy.getTypedef(); if (base != null && !(base instanceof UnknownType)) { return copy; } else if (base instanceof UnknownType) { - UnknownType unknownType = (UnknownType) base; - QName unknownTypeQName = unknownType.getQName(); - String unknownTypePrefix = unknownTypeQName.getPrefix(); - ModuleBuilder dependentModule = findDependentModule(modules, + final UnknownType unknownType = (UnknownType) base; + final QName unknownTypeQName = unknownType.getQName(); + final String unknownTypePrefix = unknownTypeQName.getPrefix(); + final ModuleBuilder dependentModule = findDependentModule(modules, builder, unknownTypePrefix); - TypeDefinitionBuilder unknownTypeBuilder = getTypedefBuilder(copy, + final TypeDefinitionBuilder utBuilder = getTypedefBuilder(copy, modules, dependentModule); - copy.setType(unknownTypeBuilder); + copy.setType(utBuilder); return copy; } else if (base == null && baseTdb != null) { // make a copy of baseTypeDef and call again - TypeDefinitionBuilder baseTdbCopy = copyTypedefBuilder(baseTdb, - true); - TypeDefinitionBuilder baseTdbCopyResolved = resolveCopiedBuilder( + final TypeDefinitionBuilder baseTdbCopy = copyTypedefBuilder( + baseTdb, true); + final TypeDefinitionBuilder baseTdbCopyResolved = resolveCopiedBuilder( baseTdbCopy, modules, builder); copy.setType(baseTdbCopyResolved); return copy; } else { - throw new IllegalStateException( - "TypeDefinitionBuilder in unexpected state"); + throw new IllegalStateException("Failed to resolve type " + + copy.getQName().getLocalName()); } } - private TypeDefinitionBuilder findTypedefBuilder(QName unknownTypeQName, - Map> modules, - ModuleBuilder builder) { - - String unknownTypeName = unknownTypeQName.getLocalName(); - String unknownTypePrefix = unknownTypeQName.getPrefix(); - + private TypeDefinitionBuilder findTypedefBuilder( + final QName unknownTypeQName, + final Map> modules, + final ModuleBuilder builder) { // search for module which contains referenced typedef - ModuleBuilder dependentModule = findDependentModule(modules, builder, - unknownTypePrefix); - - TypeDefinitionBuilder lookedUpBuilder = findTypedefBuilderByName( - dependentModule, unknownTypeName); - - TypeDefinitionBuilder copied = copyTypedefBuilder(lookedUpBuilder, true); - return copied; + final ModuleBuilder dependentModule = findDependentModule(modules, + builder, unknownTypeQName.getPrefix()); + final TypeDefinitionBuilder lookedUpBuilder = findTypedefBuilderByName( + dependentModule, unknownTypeQName.getLocalName()); + return copyTypedefBuilder(lookedUpBuilder, true); } - private TypeConstraints findConstraints(TypeAwareBuilder nodeToResolve, - TypeConstraints constraints, - Map> modules, - ModuleBuilder builder) { - + private TypeConstraints findConstraints( + final TypeAwareBuilder nodeToResolve, + final TypeConstraints constraints, + final Map> modules, + final ModuleBuilder builder) { // union type cannot be restricted if (nodeToResolve instanceof UnionTypeBuilder) { return constraints; @@ -513,13 +469,13 @@ public class YangModelParserImpl implements YangModelParser { // if referenced type is UnknownType again, search recursively with // current constraints - TypeDefinition referencedType = nodeToResolve.getType(); + final TypeDefinition referencedType = nodeToResolve.getType(); List ranges = Collections.emptyList(); List lengths = Collections.emptyList(); List patterns = Collections.emptyList(); Integer fractionDigits = null; if (referencedType == null) { - TypeDefinitionBuilder tdb = (TypeDefinitionBuilder) nodeToResolve; + final TypeDefinitionBuilder tdb = (TypeDefinitionBuilder) nodeToResolve; ranges = tdb.getRanges(); constraints.addRanges(ranges); lengths = tdb.getLengths(); @@ -530,7 +486,7 @@ public class YangModelParserImpl implements YangModelParser { constraints.setFractionDigits(fractionDigits); return constraints; } else if (referencedType instanceof ExtendedType) { - ExtendedType ext = (ExtendedType) referencedType; + final ExtendedType ext = (ExtendedType) referencedType; ranges = ext.getRanges(); constraints.addRanges(ranges); lengths = ext.getLengths(); @@ -543,8 +499,7 @@ public class YangModelParserImpl implements YangModelParser { findTypedefBuilder(ext.getQName(), modules, builder), constraints, modules, builder); } else if (referencedType instanceof UnknownType) { - UnknownType unknown = (UnknownType) referencedType; - + final UnknownType unknown = (UnknownType) referencedType; ranges = unknown.getRangeStatements(); constraints.addRanges(ranges); lengths = unknown.getLengthStatements(); @@ -558,18 +513,17 @@ public class YangModelParserImpl implements YangModelParser { if (unknownTypePrefix == null || "".equals(unknownTypePrefix)) { unknownTypePrefix = builder.getPrefix(); } - ModuleBuilder dependentModule = findDependentModule(modules, + final ModuleBuilder dependentModule = findDependentModule(modules, builder, unknown.getQName().getPrefix()); - TypeDefinitionBuilder unknownTypeBuilder = findTypedefBuilder( + final TypeDefinitionBuilder utBuilder = findTypedefBuilder( unknown.getQName(), modules, builder); - return findConstraints(unknownTypeBuilder, constraints, modules, + return findConstraints(utBuilder, constraints, modules, dependentModule); } else { // HANDLE BASE YANG TYPE mergeConstraints(referencedType, constraints); return constraints; } - } /** @@ -583,7 +537,7 @@ public class YangModelParserImpl implements YangModelParser { * @return typedef with name equals to given name */ private TypeDefinitionBuilder findTypedefBuilderByName( - ModuleBuilder dependentModule, String name) { + final ModuleBuilder dependentModule, final String name) { TypeDefinitionBuilder result = null; final Set typedefs = dependentModule .getModuleTypedefs(); @@ -607,8 +561,8 @@ public class YangModelParserImpl implements YangModelParser { * @param referencedType * @param constraints */ - private void mergeConstraints(TypeDefinition referencedType, - TypeConstraints constraints) { + private void mergeConstraints(final TypeDefinition referencedType, + final TypeConstraints constraints) { if (referencedType instanceof DecimalTypeDefinition) { constraints.addRanges(((DecimalTypeDefinition) referencedType) @@ -631,88 +585,117 @@ public class YangModelParserImpl implements YangModelParser { } /** - * Go through all augmentation definitions and resolve them. This means find - * referenced node and add child nodes to it. + * Go through all augmentation definitions and resolve them. This method + * also finds referenced node and add child nodes to it. * * @param modules * all available modules - * @param module - * current module */ - public void resolveAugments( - Map> modules, - ModuleBuilder module) { - Set augmentBuilders = module - .getAddedAugments(); - - for (AugmentationSchemaBuilder augmentBuilder : augmentBuilders) { - SchemaPath augmentTargetSchemaPath = augmentBuilder.getTargetPath(); - List path = augmentTargetSchemaPath.getPath(); - - String prefix = path.get(path.size() - 1).getPrefix(); - List augmentTargetPath = new ArrayList(); - - for (QName pathPart : path) { - if (pathPart.getPrefix().equals(prefix)) { - augmentTargetPath.add(pathPart.getLocalName()); - } - } - if (prefix == null) { - prefix = module.getPrefix(); + private void resolveAugments( + final Map> modules) { + final List allModulesList = new ArrayList(); + final Set allModulesSet = new HashSet(); + for (Map.Entry> entry : modules + .entrySet()) { + for (Map.Entry inner : entry.getValue() + .entrySet()) { + allModulesList.add(inner.getValue()); + allModulesSet.add(inner.getValue()); } + } - ModuleBuilder dependentModule = findDependentModule(modules, - module, prefix); - augmentTargetPath.add(0, dependentModule.getName()); - - AugmentationTargetBuilder augmentTarget = (AugmentationTargetBuilder) dependentModule - .getNode(augmentTargetPath); - - // augment target could be another augment, so if target is not - // found, get augments in target module and search for target node - if (augmentTarget == null) { - for (AugmentationSchemaBuilder builder : dependentModule - .getAddedAugments()) { - for (DataSchemaNodeBuilder dataBuilder : builder - .getChildNodes()) { - SchemaPath dataBuilderPath = dataBuilder.getPath(); - List qnamePath = dataBuilderPath.getPath(); - List dataBuilderStringPath = new ArrayList(); - - // start from 1: augment name omitted - for (int i = 1; i < qnamePath.size(); i++) { - dataBuilderStringPath.add(qnamePath.get(i) - .getLocalName()); - } - // module name omitted - augmentTargetPath.remove(0); - if (augmentTargetPath.equals(dataBuilderStringPath)) { - augmentTarget = (AugmentationTargetBuilder) dataBuilder; - augmentTarget.addAugmentation(augmentBuilder); - fillAugmentTarget(augmentBuilder, - (ChildNodeBuilder) augmentTarget); - } - } + for (int i = 0; i < allModulesList.size(); i++) { + final ModuleBuilder module = allModulesList.get(i); + // try to resolve augments in module + resolveAugment(modules, module); + // while all augments are not resolved + final Iterator allModulesIterator = allModulesSet + .iterator(); + while (!(module.getAugmentsResolved() == module.getAddedAugments() + .size())) { + ModuleBuilder nextModule = null; + // try resolve other module augments + try { + nextModule = allModulesIterator.next(); + resolveAugment(modules, nextModule); + } catch (NoSuchElementException e) { + throw new YangParseException( + "Failed to resolve augments in module '" + + module.getName() + "'.", e); } - } else { - augmentTarget.addAugmentation(augmentBuilder); - fillAugmentTarget(augmentBuilder, - (ChildNodeBuilder) augmentTarget); + // then try to resolve first module again + resolveAugment(modules, module); } } } /** - * Add all augment's child nodes to given target. * - * @param augment - * @param target + * @param modules + * all available modules + * @param module + * current module */ - private void fillAugmentTarget(AugmentationSchemaBuilder augment, - ChildNodeBuilder target) { - for (DataSchemaNodeBuilder builder : augment.getChildNodes()) { - builder.setAugmenting(true); - target.addChildNode(builder); + private void resolveAugment( + final Map> modules, + final ModuleBuilder module) { + if (module.getAugmentsResolved() < module.getAddedAugments().size()) { + for (AugmentationSchemaBuilder augmentBuilder : module + .getAddedAugments()) { + final SchemaPath augmentTargetSchemaPath = augmentBuilder + .getTargetPath(); + final List path = augmentTargetSchemaPath.getPath(); + + int i = 0; + final QName qname = path.get(i); + String prefix = qname.getPrefix(); + if (prefix == null) { + prefix = module.getPrefix(); + } + + DataSchemaNodeBuilder currentParent = null; + final ModuleBuilder dependentModule = findDependentModule( + modules, module, prefix); + for (DataSchemaNodeBuilder child : dependentModule + .getChildNodes()) { + final QName childQName = child.getQName(); + if (childQName.getLocalName().equals(qname.getLocalName())) { + currentParent = child; + i++; + break; + } + } + + for (; i < path.size(); i++) { + final QName currentQName = path.get(i); + DataSchemaNodeBuilder newParent = null; + for (DataSchemaNodeBuilder child : ((ChildNodeBuilder) currentParent) + .getChildNodes()) { + final QName childQName = child.getQName(); + if (childQName.getLocalName().equals( + currentQName.getLocalName())) { + newParent = child; + break; + } + } + if (newParent == null) { + break; // node not found, quit search + } else { + currentParent = newParent; + } + } + + final QName currentQName = currentParent.getQName(); + final QName lastAugmentPathElement = path.get(path.size() - 1); + if (currentQName.getLocalName().equals( + lastAugmentPathElement.getLocalName())) { + ParserUtils.fillAugmentTarget(augmentBuilder, + (ChildNodeBuilder) currentParent); + ((AugmentationTargetBuilder) currentParent) + .addAugmentation(augmentBuilder); + module.augmentResolved(); + } + } } } @@ -726,26 +709,27 @@ public class YangModelParserImpl implements YangModelParser { * module being resolved */ private void resolveIdentities( - Map> modules, - ModuleBuilder module) { - Set identities = module.getAddedIdentities(); + final Map> modules, + final ModuleBuilder module) { + final Set identities = module + .getAddedIdentities(); for (IdentitySchemaNodeBuilder identity : identities) { - String baseIdentityName = identity.getBaseIdentityName(); + final String baseIdentityName = identity.getBaseIdentityName(); if (baseIdentityName != null) { String baseIdentityPrefix = null; String baseIdentityLocalName = null; if (baseIdentityName.contains(":")) { - String[] splitted = baseIdentityName.split(":"); + final String[] splitted = baseIdentityName.split(":"); baseIdentityPrefix = splitted[0]; baseIdentityLocalName = splitted[1]; } else { baseIdentityPrefix = module.getPrefix(); baseIdentityLocalName = baseIdentityName; } - ModuleBuilder dependentModule = findDependentModule(modules, - module, baseIdentityPrefix); + final ModuleBuilder dependentModule = findDependentModule( + modules, module, baseIdentityPrefix); - Set dependentModuleIdentities = dependentModule + final Set dependentModuleIdentities = dependentModule .getAddedIdentities(); for (IdentitySchemaNodeBuilder idBuilder : dependentModuleIdentities) { if (idBuilder.getQName().getLocalName() @@ -766,33 +750,33 @@ public class YangModelParserImpl implements YangModelParser { * @param module * module being resolved */ - private void resolveUses(Map> modules, - ModuleBuilder module) { - Map, UsesNodeBuilder> moduleUses = module + private void resolveUses( + final Map> modules, + final ModuleBuilder module) { + final Map, UsesNodeBuilder> moduleUses = module .getAddedUsesNodes(); for (Map.Entry, UsesNodeBuilder> entry : moduleUses .entrySet()) { - List key = entry.getKey(); - UsesNodeBuilder usesNode = entry.getValue(); - - String groupingName = key.get(key.size() - 1); + final List key = entry.getKey(); + final UsesNodeBuilder usesNode = entry.getValue(); - List refines = usesNode.getRefines(); - for (RefineHolder refine : refines) { - Refine refineType = refine.getType(); + final String groupingName = key.get(key.size() - 1); + for (RefineHolder refine : usesNode.getRefines()) { // refine statements - String defaultStr = refine.getDefaultStr(); - Boolean mandatory = refine.isMandatory(); - MustDefinition must = refine.getMust(); - Boolean presence = refine.isPresence(); - Integer min = refine.getMinElements(); - Integer max = refine.getMaxElements(); - - switch (refineType) { - case LEAF: - LeafSchemaNodeBuilder leaf = (LeafSchemaNodeBuilder) getRefineTargetBuilder( - groupingName, refine, modules, module); + final String defaultStr = refine.getDefaultStr(); + final Boolean mandatory = refine.isMandatory(); + final MustDefinition must = refine.getMust(); + final Boolean presence = refine.isPresence(); + final Integer min = refine.getMinElements(); + final Integer max = refine.getMaxElements(); + final List unknownNodes = refine + .getUnknownNodes(); + + Builder refineTarget = getRefineTargetBuilder(groupingName, + refine, modules, module); + if (refineTarget instanceof LeafSchemaNodeBuilder) { + final LeafSchemaNodeBuilder leaf = (LeafSchemaNodeBuilder) refineTarget; if (defaultStr != null && !("".equals(defaultStr))) { leaf.setDefaultStr(defaultStr); } @@ -802,22 +786,28 @@ public class YangModelParserImpl implements YangModelParser { if (must != null) { leaf.getConstraints().addMustDefinition(must); } + if (unknownNodes != null) { + for (UnknownSchemaNodeBuilder unknown : unknownNodes) { + leaf.addUnknownSchemaNode(unknown); + } + } usesNode.addRefineNode(leaf); - break; - case CONTAINER: - ContainerSchemaNodeBuilder container = (ContainerSchemaNodeBuilder) getRefineTargetBuilder( - groupingName, refine, modules, module); + } else if (refineTarget instanceof ContainerSchemaNodeBuilder) { + final ContainerSchemaNodeBuilder container = (ContainerSchemaNodeBuilder) refineTarget; if (presence != null) { container.setPresence(presence); } if (must != null) { container.getConstraints().addMustDefinition(must); } + if (unknownNodes != null) { + for (UnknownSchemaNodeBuilder unknown : unknownNodes) { + container.addUnknownSchemaNode(unknown); + } + } usesNode.addRefineNode(container); - break; - case LIST: - ListSchemaNodeBuilder list = (ListSchemaNodeBuilder) getRefineTargetBuilder( - groupingName, refine, modules, module); + } else if (refineTarget instanceof ListSchemaNodeBuilder) { + final ListSchemaNodeBuilder list = (ListSchemaNodeBuilder) refineTarget; if (must != null) { list.getConstraints().addMustDefinition(must); } @@ -827,9 +817,13 @@ public class YangModelParserImpl implements YangModelParser { if (max != null) { list.getConstraints().setMaxElements(max); } - break; - case LEAF_LIST: - LeafListSchemaNodeBuilder leafList = (LeafListSchemaNodeBuilder) getRefineTargetBuilder( + if (unknownNodes != null) { + for (UnknownSchemaNodeBuilder unknown : unknownNodes) { + list.addUnknownSchemaNode(unknown); + } + } + } else if (refineTarget instanceof LeafListSchemaNodeBuilder) { + final LeafListSchemaNodeBuilder leafList = (LeafListSchemaNodeBuilder) getRefineTargetBuilder( groupingName, refine, modules, module); if (must != null) { leafList.getConstraints().addMustDefinition(must); @@ -840,30 +834,40 @@ public class YangModelParserImpl implements YangModelParser { if (max != null) { leafList.getConstraints().setMaxElements(max); } - break; - case CHOICE: - ChoiceBuilder choice = (ChoiceBuilder) getRefineTargetBuilder( - groupingName, refine, modules, module); + if (unknownNodes != null) { + for (UnknownSchemaNodeBuilder unknown : unknownNodes) { + leafList.addUnknownSchemaNode(unknown); + } + } + } else if (refineTarget instanceof ChoiceBuilder) { + final ChoiceBuilder choice = (ChoiceBuilder) refineTarget; if (defaultStr != null) { choice.setDefaultCase(defaultStr); } if (mandatory != null) { choice.getConstraints().setMandatory(mandatory); } - break; - case ANYXML: - AnyXmlBuilder anyXml = (AnyXmlBuilder) getRefineTargetBuilder( - groupingName, refine, modules, module); + if (unknownNodes != null) { + for (UnknownSchemaNodeBuilder unknown : unknownNodes) { + choice.addUnknownSchemaNode(unknown); + } + } + } else if (refineTarget instanceof AnyXmlBuilder) { + final AnyXmlBuilder anyXml = (AnyXmlBuilder) refineTarget; if (mandatory != null) { anyXml.getConstraints().setMandatory(mandatory); } if (must != null) { anyXml.getConstraints().addMustDefinition(must); } + if (unknownNodes != null) { + for (UnknownSchemaNodeBuilder unknown : unknownNodes) { + anyXml.addUnknownSchemaNode(unknown); + } + } } } } - } /** @@ -880,12 +884,12 @@ public class YangModelParserImpl implements YangModelParser { * @return copy of Builder object of node to be refined if it is present in * grouping, null otherwise */ - private Builder getRefineTargetBuilder(String groupingPath, - RefineHolder refine, - Map> modules, - ModuleBuilder module) { + private Builder getRefineTargetBuilder(final String groupingPath, + final RefineHolder refine, + final Map> modules, + final ModuleBuilder module) { Builder result = null; - Builder lookedUpBuilder = findRefineTargetBuilder(groupingPath, + final Builder lookedUpBuilder = findRefineTargetBuilder(groupingPath, refine.getName(), modules, module); if (lookedUpBuilder instanceof LeafSchemaNodeBuilder) { result = ParserUtils @@ -926,12 +930,12 @@ public class YangModelParserImpl implements YangModelParser { * @return Builder object of refine node if it is present in grouping, null * otherwise */ - private Builder findRefineTargetBuilder(String groupingPath, - String refineNodeName, - Map> modules, - ModuleBuilder module) { - SchemaPath path = ParserUtils.parseUsesPath(groupingPath); - List builderPath = new ArrayList(); + private Builder findRefineTargetBuilder(final String groupingPath, + final String refineNodeName, + final Map> modules, + final ModuleBuilder module) { + final SchemaPath path = ParserUtils.parseUsesPath(groupingPath); + final List builderPath = new ArrayList(); String prefix = null; for (QName qname : path.getPath()) { builderPath.add(qname.getLocalName()); @@ -941,16 +945,40 @@ public class YangModelParserImpl implements YangModelParser { prefix = module.getPrefix(); } - ModuleBuilder dependentModule = findDependentModule(modules, module, - prefix); + final ModuleBuilder dependentModule = findDependentModule(modules, + module, prefix); builderPath.add(0, "grouping"); builderPath.add(0, dependentModule.getName()); - GroupingBuilder builder = (GroupingBuilder) dependentModule + final GroupingBuilder builder = (GroupingBuilder) dependentModule .getNode(builderPath); return builder.getChildNode(refineNodeName); } + private QName findFullQName( + final Map> modules, + final ModuleBuilder module, final IdentityrefTypeBuilder idref) { + QName result = null; + String baseString = idref.getBaseString(); + if (baseString.contains(":")) { + String[] splittedBase = baseString.split(":"); + if (splittedBase.length > 2) { + throw new YangParseException( + "Failed to parse identityref base: " + baseString); + } + String prefix = splittedBase[0]; + String name = splittedBase[1]; + ModuleBuilder dependentModule = findDependentModule(modules, + module, prefix); + result = new QName(dependentModule.getNamespace(), + dependentModule.getRevision(), prefix, name); + } else { + result = new QName(module.getNamespace(), module.getRevision(), + module.getPrefix(), baseString); + } + return result; + } + /** * Find dependent module based on given prefix * @@ -963,23 +991,25 @@ public class YangModelParserImpl implements YangModelParser { * @return */ private ModuleBuilder findDependentModule( - Map> modules, - ModuleBuilder module, String prefix) { + final Map> modules, + final ModuleBuilder module, final String prefix) { ModuleBuilder dependentModule = null; Date dependentModuleRevision = null; if (prefix.equals(module.getPrefix())) { dependentModule = module; } else { - ModuleImport dependentModuleImport = getModuleImport(module, prefix); + final ModuleImport dependentModuleImport = ParserUtils + .getModuleImport(module, prefix); if (dependentModuleImport == null) { throw new YangParseException("No import found with prefix '" + prefix + "' in module " + module.getName() + "'."); } - String dependentModuleName = dependentModuleImport.getModuleName(); + final String dependentModuleName = dependentModuleImport + .getModuleName(); dependentModuleRevision = dependentModuleImport.getRevision(); - TreeMap moduleBuildersByRevision = modules + final TreeMap moduleBuildersByRevision = modules .get(dependentModuleName); if (moduleBuildersByRevision == null) { throw new YangParseException( @@ -1005,30 +1035,10 @@ public class YangModelParserImpl implements YangModelParser { return dependentModule; } - /** - * Get module import referenced by given prefix. - * - * @param builder - * module to search - * @param prefix - * prefix associated with import - * @return ModuleImport based on given prefix - */ - private ModuleImport getModuleImport(ModuleBuilder builder, String prefix) { - ModuleImport moduleImport = null; - for (ModuleImport mi : builder.getModuleImports()) { - if (mi.getPrefix().equals(prefix)) { - moduleImport = mi; - break; - } - } - return moduleImport; - } - private static class SchemaContextImpl implements SchemaContext { private final Set modules; - private SchemaContextImpl(Set modules) { + private SchemaContextImpl(final Set modules) { this.modules = modules; } @@ -1087,7 +1097,7 @@ public class YangModelParserImpl implements YangModelParser { } @Override - public Module findModuleByNamespace(URI namespace) { + public Module findModuleByNamespace(final URI namespace) { if (namespace != null) { for (final Module module : modules) { if (module.getNamespace().equals(namespace)) {