X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fsal%2Fyang-prototype%2Fcode-generator%2Fyang-model-parser-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fyang%2Fparser%2Fbuilder%2Fimpl%2FModuleBuilder.java;h=f424bcfdf939cfc14b9d9dcd8bd3dc066f0e96bc;hp=efa3849e90db4423f5ffee79d1d59ca2b1fec80a;hb=ac39de5a9b96438d30df745895454c02e15e51e3;hpb=a9e6627736e99183c5c6be4dd42ec364836acb80 diff --git a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/ModuleBuilder.java b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/ModuleBuilder.java index efa3849e90..f424bcfdf9 100644 --- a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/ModuleBuilder.java +++ b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/ModuleBuilder.java @@ -11,12 +11,14 @@ import java.net.URI; import java.util.ArrayList; import java.util.Collections; import java.util.Date; -import java.util.HashMap; import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.TreeMap; +import java.util.TreeSet; import org.opendaylight.controller.yang.common.QName; import org.opendaylight.controller.yang.model.api.AugmentationSchema; @@ -34,6 +36,7 @@ import org.opendaylight.controller.yang.model.api.SchemaPath; import org.opendaylight.controller.yang.model.api.TypeDefinition; import org.opendaylight.controller.yang.model.api.UnknownSchemaNode; import org.opendaylight.controller.yang.model.api.UsesNode; +import org.opendaylight.controller.yang.parser.builder.api.AbstractDataNodeContainerBuilder; import org.opendaylight.controller.yang.parser.builder.api.AugmentationSchemaBuilder; import org.opendaylight.controller.yang.parser.builder.api.Builder; import org.opendaylight.controller.yang.parser.builder.api.DataNodeContainerBuilder; @@ -41,18 +44,18 @@ import org.opendaylight.controller.yang.parser.builder.api.DataSchemaNodeBuilder import org.opendaylight.controller.yang.parser.builder.api.GroupingBuilder; import org.opendaylight.controller.yang.parser.builder.api.SchemaNodeBuilder; import org.opendaylight.controller.yang.parser.builder.api.TypeAwareBuilder; -import org.opendaylight.controller.yang.parser.builder.api.TypeDefinitionAwareBuilder; import org.opendaylight.controller.yang.parser.builder.api.TypeDefinitionBuilder; import org.opendaylight.controller.yang.parser.builder.api.UsesNodeBuilder; +import org.opendaylight.controller.yang.parser.util.Comparators; import org.opendaylight.controller.yang.parser.util.RefineHolder; import org.opendaylight.controller.yang.parser.util.YangParseException; /** - * This builder builds Module object. If this module is dependent on external + * Builder of Module object. If this module is dependent on external * module/modules, these dependencies must be resolved before module is built, * otherwise result may not be valid. */ -public class ModuleBuilder implements Builder { +public class ModuleBuilder extends AbstractDataNodeContainerBuilder { private final ModuleImpl instance; private final String name; private URI namespace; @@ -61,32 +64,25 @@ public class ModuleBuilder implements Builder { private int augmentsResolved; - private final Set imports = new HashSet(); - - /** - * Holds all child (DataSchemaNode) nodes: anyxml, choice, case, container, - * list, leaf, leaf-list. - */ - private final Map, DataSchemaNodeBuilder> childNodes = new HashMap, DataSchemaNodeBuilder>(); + private final LinkedList actualPath = new LinkedList(); + private final Set dirtyNodes = new HashSet(); - private final Map, GroupingBuilder> addedGroupings = new HashMap, GroupingBuilder>(); + private final Set imports = new HashSet(); private final List addedAugments = new ArrayList(); - private final Map, UsesNodeBuilder> addedUsesNodes = new HashMap, UsesNodeBuilder>(); - private final Map, RpcDefinitionBuilder> addedRpcs = new HashMap, RpcDefinitionBuilder>(); + private final List allAugments = new ArrayList(); + private final Set addedUsesNodes = new HashSet(); + private final List allUsesNodes = new ArrayList(); + private final Set addedRpcs = new HashSet(); private final Set addedNotifications = new HashSet(); private final Set addedIdentities = new HashSet(); - private final Map, FeatureBuilder> addedFeatures = new HashMap, FeatureBuilder>(); - private final Map, DeviationBuilder> addedDeviations = new HashMap, DeviationBuilder>(); - private final Map, TypeDefinitionBuilder> addedTypedefs = new HashMap, TypeDefinitionBuilder>(); - private final Map, UnionTypeBuilder> addedUnionTypes = new HashMap, UnionTypeBuilder>(); + private final Set addedFeatures = new HashSet(); + private final Set addedDeviations = new HashSet(); + private final Set addedTypedefs = new HashSet(); private final List addedExtensions = new ArrayList(); - private final Map, UnknownSchemaNodeBuilder> addedUnknownNodes = new HashMap, UnknownSchemaNodeBuilder>(); - - private final Map, TypeAwareBuilder> dirtyNodes = new HashMap, TypeAwareBuilder>(); - - private final LinkedList actualPath = new LinkedList(); + private final List allUnknownNodes = new ArrayList(); public ModuleBuilder(final String name) { + super(name, 0, null); this.name = name; instance = new ModuleImpl(name); } @@ -102,27 +98,43 @@ public class ModuleBuilder implements Builder { instance.setNamespace(namespace); // TYPEDEFS - final Set> typedefs = buildModuleTypedefs(addedTypedefs); + final Set> typedefs = new TreeSet>(Comparators.SCHEMA_NODE_COMP); + for (TypeDefinitionBuilder tdb : addedTypedefs) { + typedefs.add(tdb.build()); + } instance.setTypeDefinitions(typedefs); // CHILD NODES - final Map children = buildModuleChildNodes(childNodes); + final Map children = new TreeMap(Comparators.QNAME_COMP); + for (DataSchemaNodeBuilder child : addedChildNodes) { + children.put(child.getQName(), child.build()); + } instance.setChildNodes(children); // GROUPINGS - final Set groupings = buildModuleGroupings(addedGroupings); + final Set groupings = new TreeSet(Comparators.SCHEMA_NODE_COMP); + for (GroupingBuilder gb : addedGroupings) { + groupings.add(gb.build()); + } instance.setGroupings(groupings); // USES - final Set usesDefinitions = buildUsesNodes(addedUsesNodes); + final Set usesDefinitions = new HashSet(); + for (UsesNodeBuilder unb : addedUsesNodes) { + usesDefinitions.add(unb.build()); + } instance.setUses(usesDefinitions); // FEATURES - final Set features = buildModuleFeatures(addedFeatures); + final Set features = new TreeSet(Comparators.SCHEMA_NODE_COMP); + for (FeatureBuilder fb : addedFeatures) { + features.add(fb.build()); + } instance.setFeatures(features); // NOTIFICATIONS - final Set notifications = new HashSet(); + final Set notifications = new TreeSet( + Comparators.SCHEMA_NODE_COMP); for (NotificationBuilder entry : addedNotifications) { notifications.add(entry.build()); } @@ -136,40 +148,57 @@ public class ModuleBuilder implements Builder { instance.setAugmentations(augmentations); // RPCs - final Set rpcs = buildModuleRpcs(addedRpcs); + final Set rpcs = new TreeSet(Comparators.SCHEMA_NODE_COMP); + for (RpcDefinitionBuilder rpc : addedRpcs) { + rpcs.add(rpc.build()); + } instance.setRpcs(rpcs); // DEVIATIONS final Set deviations = new HashSet(); - for (Map.Entry, DeviationBuilder> entry : addedDeviations.entrySet()) { - deviations.add(entry.getValue().build()); + for (DeviationBuilder entry : addedDeviations) { + deviations.add(entry.build()); } instance.setDeviations(deviations); // EXTENSIONS final List extensions = new ArrayList(); - for (ExtensionBuilder b : addedExtensions) { - extensions.add(b.build()); + for (ExtensionBuilder eb : addedExtensions) { + extensions.add(eb.build()); } + Collections.sort(extensions, Comparators.SCHEMA_NODE_COMP); instance.setExtensionSchemaNodes(extensions); // IDENTITIES - final Set identities = new HashSet(); - for (IdentitySchemaNodeBuilder idBuilder : addedIdentities) { - identities.add(idBuilder.build()); + final Set identities = new TreeSet(Comparators.SCHEMA_NODE_COMP); + for (IdentitySchemaNodeBuilder id : addedIdentities) { + identities.add(id.build()); } instance.setIdentities(identities); // UNKNOWN NODES - final List unknownNodes = buildModuleUnknownNodes(addedUnknownNodes); + final List unknownNodes = new ArrayList(); + for (UnknownSchemaNodeBuilder unb : addedUnknownNodes) { + unknownNodes.add(unb.build()); + } instance.setUnknownSchemaNodes(unknownNodes); return instance; } @Override - public int getLine() { - return 0; + public void setParent(Builder parent) { + throw new YangParseException(name, 0, "Can not set parent to module"); + } + + @Override + public SchemaPath getPath() { + return null; + } + + @Override + public Set getTypeDefinitionBuilders() { + return addedTypedefs; } public void enterNode(final Builder node) { @@ -188,68 +217,36 @@ public class ModuleBuilder implements Builder { } } - public Builder getModuleNode(final List path) { - return childNodes.get(path); - } - - public GroupingBuilder getGrouping(final List path) { - return addedGroupings.get(path); - } - - public Builder getModuleTypedef(final List path) { - return addedTypedefs.get(path); - } - - public Set getChildNodes() { - final Set children = new HashSet(); - for (Map.Entry, DataSchemaNodeBuilder> entry : childNodes.entrySet()) { - final List path = entry.getKey(); - final DataSchemaNodeBuilder child = entry.getValue(); - if (path.size() == 2) { - children.add(child); - } + public Builder getActualParent() { + if (actualPath.size() < 2) { + return null; + } else { + return actualPath.get(1); } - return children; } - public Map, TypeAwareBuilder> getDirtyNodes() { + public Set getDirtyNodes() { return dirtyNodes; } - public List getAugments() { - return addedAugments; + public List getAllAugments() { + return allAugments; } public Set getIdentities() { return addedIdentities; } - public Map, UsesNodeBuilder> getUsesNodes() { - return addedUsesNodes; + public List getAllUsesNodes() { + return allUsesNodes; } - public Set getUnknownNodes() { - return new HashSet(addedUnknownNodes.values()); + public Set getDeviations() { + return addedDeviations; } - public Set getModuleTypedefs() { - final Set typedefs = new HashSet(); - for (Map.Entry, TypeDefinitionBuilder> entry : addedTypedefs.entrySet()) { - if (entry.getKey().size() == 2) { - typedefs.add(entry.getValue()); - } - } - return typedefs; - } - - public Set getModuleGroupings() { - final Set groupings = new HashSet(); - for (Map.Entry, GroupingBuilder> entry : addedGroupings.entrySet()) { - if (entry.getKey().size() == 2) { - groupings.add(entry.getValue()); - } - } - return groupings; + public List getAllUnknownNodes() { + return allUnknownNodes; } public String getName() { @@ -280,10 +277,9 @@ public class ModuleBuilder implements Builder { augmentsResolved++; } - public void addDirtyNode(final List path) { - final List dirtyNodePath = new ArrayList(path); - final TypeAwareBuilder nodeBuilder = (TypeAwareBuilder) actualPath.getFirst(); - dirtyNodes.put(dirtyNodePath, nodeBuilder); + public void markActualNodeDirty() { + final TypeAwareBuilder nodeBuilder = (TypeAwareBuilder) getActualNode(); + dirtyNodes.add(nodeBuilder); } public void setRevision(final Date revision) { @@ -324,396 +320,469 @@ public class ModuleBuilder implements Builder { } public ExtensionBuilder addExtension(final QName qname, final int line) { - final ExtensionBuilder builder = new ExtensionBuilder(qname, line); + final String extName = qname.getLocalName(); + for (ExtensionBuilder addedExtension : addedExtensions) { + if (addedExtension.getQName().getLocalName().equals(extName)) { + throw new YangParseException(moduleName, line, "Can not add extension '" + extName + + "': extension with same name already declared at line " + addedExtension.getLine()); + } + } + final ExtensionBuilder builder = new ExtensionBuilder(name, line, qname); addedExtensions.add(builder); return builder; } - public ContainerSchemaNodeBuilder addContainerNode(final QName containerName, final List parentPath, - final int line) { - final List pathToNode = new ArrayList(parentPath); - final ContainerSchemaNodeBuilder containerBuilder = new ContainerSchemaNodeBuilder(containerName, line); - updateParent(containerBuilder, line, "container"); + public ContainerSchemaNodeBuilder addContainerNode(final int line, final QName qname, final SchemaPath schemaPath) { + final ContainerSchemaNodeBuilder builder = new ContainerSchemaNodeBuilder(name, line, qname, schemaPath); - pathToNode.add(containerName.getLocalName()); - childNodes.put(pathToNode, containerBuilder); + Builder parent = getActualNode(); + builder.setParent(parent); + addChildToParent(parent, builder, qname.getLocalName()); - return containerBuilder; + return builder; } - public ListSchemaNodeBuilder addListNode(final QName listName, final List parentPath, final int line) { - final List pathToNode = new ArrayList(parentPath); - final ListSchemaNodeBuilder listBuilder = new ListSchemaNodeBuilder(listName, line); - updateParent(listBuilder, line, "list"); + public ListSchemaNodeBuilder addListNode(final int line, final QName qname, final SchemaPath schemaPath) { + final ListSchemaNodeBuilder builder = new ListSchemaNodeBuilder(name, line, qname, schemaPath); - pathToNode.add(listName.getLocalName()); - childNodes.put(pathToNode, listBuilder); + Builder parent = getActualNode(); + builder.setParent(parent); + addChildToParent(parent, builder, qname.getLocalName()); - return listBuilder; + return builder; } - public LeafSchemaNodeBuilder addLeafNode(final QName leafName, final List parentPath, final int line) { - final List pathToNode = new ArrayList(parentPath); - final LeafSchemaNodeBuilder leafBuilder = new LeafSchemaNodeBuilder(leafName, line); - updateParent(leafBuilder, line, "leaf"); + public LeafSchemaNodeBuilder addLeafNode(final int line, final QName qname, final SchemaPath schemaPath) { + final LeafSchemaNodeBuilder builder = new LeafSchemaNodeBuilder(name, line, qname, schemaPath); - pathToNode.add(leafName.getLocalName()); - childNodes.put(pathToNode, leafBuilder); + Builder parent = getActualNode(); + builder.setParent(parent); + addChildToParent(parent, builder, qname.getLocalName()); - return leafBuilder; + return builder; } - public LeafListSchemaNodeBuilder addLeafListNode(final QName qname, final List parentPath, final int line) { - final List pathToNode = new ArrayList(parentPath); - final LeafListSchemaNodeBuilder leafListBuilder = new LeafListSchemaNodeBuilder(qname, line); - updateParent(leafListBuilder, line, "leaf-list"); + public LeafListSchemaNodeBuilder addLeafListNode(final int line, final QName qname, final SchemaPath schemaPath) { + final LeafListSchemaNodeBuilder builder = new LeafListSchemaNodeBuilder(name, line, qname, schemaPath); - pathToNode.add(qname.getLocalName()); - childNodes.put(pathToNode, leafListBuilder); + Builder parent = getActualNode(); + builder.setParent(parent); + addChildToParent(parent, builder, qname.getLocalName()); - return leafListBuilder; + return builder; } - public GroupingBuilder addGrouping(final QName qname, final List parentPath, final int line) { - final List pathToGroup = new ArrayList(parentPath); - final GroupingBuilder builder = new GroupingBuilderImpl(qname, line); + public GroupingBuilder addGrouping(final int line, final QName qname) { + final GroupingBuilder builder = new GroupingBuilderImpl(name, line, qname); - if (!(actualPath.isEmpty())) { - final Builder parent = actualPath.getFirst(); + Builder parent = getActualNode(); + builder.setParent(parent); + + String groupingName = qname.getLocalName(); + if (parent == null) { + for (GroupingBuilder addedGrouping : addedGroupings) { + if (addedGrouping.getQName().getLocalName().equals(groupingName)) { + throw new YangParseException(name, line, "grouping with same name '" + groupingName + + "' already declared at line " + addedGrouping.getLine()); + } + } + addedGroupings.add(builder); + } else { if (parent instanceof DataNodeContainerBuilder) { - ((DataNodeContainerBuilder) parent).addGrouping(builder); + DataNodeContainerBuilder parentNode = (DataNodeContainerBuilder) parent; + for (GroupingBuilder addedGrouping : parentNode.getGroupingBuilders()) { + if (addedGrouping.getQName().getLocalName().equals(groupingName)) { + throw new YangParseException(name, line, "grouping with same name '" + groupingName + + "' already declared at line " + addedGrouping.getLine()); + } + } + parentNode.addGrouping(builder); + } else if (parent instanceof RpcDefinitionBuilder) { + RpcDefinitionBuilder parentNode = (RpcDefinitionBuilder) parent; + for (GroupingBuilder child : parentNode.getGroupings()) { + if (child.getQName().getLocalName().equals(groupingName)) { + throw new YangParseException(name, line, "grouping with same name '" + groupingName + + "' already declared at line " + child.getLine()); + } + } + parentNode.addGrouping(builder); } else { - throw new YangParseException(name, line, "Unresolved parent of grouping " + qname.getLocalName()); + throw new YangParseException(name, line, "Unresolved parent of grouping " + groupingName); } } - pathToGroup.add(qname.getLocalName()); - addedGroupings.put(pathToGroup, builder); - return builder; } - public AugmentationSchemaBuilder addAugment(final String name, final List parentPath, final int line) { - final List pathToAugment = new ArrayList(parentPath); - final AugmentationSchemaBuilder builder = new AugmentationSchemaBuilderImpl(name, line); + public AugmentationSchemaBuilder addAugment(final int line, final String augmentTargetStr) { + final AugmentationSchemaBuilder builder = new AugmentationSchemaBuilderImpl(name, line, augmentTargetStr); - // augment can only be in 'module' or 'uses' statement - if (!(actualPath.isEmpty())) { - final Builder parent = actualPath.getFirst(); + Builder parent = getActualNode(); + builder.setParent(parent); + + if (parent == null) { + // augment can be declared only under 'module' ... + addedAugments.add(builder); + } else { + // ... or 'uses' statement if (parent instanceof UsesNodeBuilder) { ((UsesNodeBuilder) parent).addAugment(builder); } else { - throw new YangParseException(this.name, line, "Unresolved parent of augment " + name); + throw new YangParseException(name, line, "Augment can be declared only under module or uses statement."); } } - - pathToAugment.add(name); - addedAugments.add(builder); + allAugments.add(builder); return builder; } - public UsesNodeBuilder addUsesNode(final String groupingPathStr, final List parentPath, final int line) { - final List pathToUses = new ArrayList(parentPath); - final UsesNodeBuilder usesBuilder = new UsesNodeBuilderImpl(groupingPathStr, line); + @Override + public void addUsesNode(UsesNodeBuilder usesBuilder) { + addedUsesNodes.add(usesBuilder); + allUsesNodes.add(usesBuilder); + } - if (!(actualPath.isEmpty())) { - final Builder parent = actualPath.getFirst(); - if (parent instanceof DataNodeContainerBuilder) { - if (parent instanceof AugmentationSchemaBuilder) { - usesBuilder.setAugmenting(true); - } - ((DataNodeContainerBuilder) parent).addUsesNode(usesBuilder); - } else { - throw new YangParseException(name, line, "Unresolved parent of uses " + groupingPathStr); + public UsesNodeBuilder addUsesNode(final int line, final String groupingPathStr) { + final UsesNodeBuilder usesBuilder = new UsesNodeBuilderImpl(name, line, groupingPathStr); + + Builder parent = getActualNode(); + usesBuilder.setParent(parent); + + if (parent == null) { + addedUsesNodes.add(usesBuilder); + } else { + if (!(parent instanceof DataNodeContainerBuilder)) { + throw new YangParseException(name, line, "Unresolved parent of uses '" + groupingPathStr + "'."); } + if (parent instanceof AugmentationSchemaBuilder) { + usesBuilder.setAugmenting(true); + } + ((DataNodeContainerBuilder) parent).addUsesNode(usesBuilder); } - - pathToUses.add(groupingPathStr); - addedUsesNodes.put(pathToUses, usesBuilder); + allUsesNodes.add(usesBuilder); return usesBuilder; } - public void addRefine(final RefineHolder refine, final List parentPath) { - final List path = new ArrayList(parentPath); - - if (actualPath.isEmpty()) { + public void addRefine(final RefineHolder refine) { + final Builder parent = getActualNode(); + if (parent == null) { throw new YangParseException(name, refine.getLine(), "refine can be defined only in uses statement"); } else { - final Builder parent = actualPath.getFirst(); if (parent instanceof UsesNodeBuilder) { ((UsesNodeBuilder) parent).addRefine(refine); } else { throw new YangParseException(name, refine.getLine(), "refine can be defined only in uses statement"); } + refine.setParent(parent); } - - path.add(refine.getName()); } - public RpcDefinitionBuilder addRpc(final QName qname, final List parentPath, final int line) { - - if (!(actualPath.isEmpty())) { + public RpcDefinitionBuilder addRpc(final int line, final QName qname) { + Builder parent = getActualNode(); + if (parent != null) { throw new YangParseException(name, line, "rpc can be defined only in module or submodule"); } - final List pathToRpc = new ArrayList(parentPath); - final RpcDefinitionBuilder rpcBuilder = new RpcDefinitionBuilder(qname, line); - - pathToRpc.add(qname.getLocalName()); - addedRpcs.put(pathToRpc, rpcBuilder); + final RpcDefinitionBuilder rpcBuilder = new RpcDefinitionBuilder(name, line, qname); + String rpcName = qname.getLocalName(); + for (RpcDefinitionBuilder rpc : addedRpcs) { + if (rpc.getQName().getLocalName().equals(rpcName)) { + throw new YangParseException(name, line, "rpc with same name '" + rpcName + + "' already declared at line " + rpc.getLine()); + } + } + for (DataSchemaNodeBuilder addedChild : addedChildNodes) { + if (addedChild.getQName().getLocalName().equals(rpcName)) { + throw new YangParseException(name, line, "Can not add rpc: node with same name '" + rpcName + + "' already declared at line " + addedChild.getLine()); + } + } + for (NotificationBuilder addedNotification : addedNotifications) { + if (addedNotification.getQName().getLocalName().equals(rpcName)) { + throw new YangParseException(name, line, "Can not add rpc: notification with same name '" + rpcName + + "' already declared at line " + addedNotification.getLine()); + } + } + addedRpcs.add(rpcBuilder); return rpcBuilder; } - public ContainerSchemaNodeBuilder addRpcInput(final QName inputQName, final int line) { - final Builder parent = actualPath.getFirst(); + public ContainerSchemaNodeBuilder addRpcInput(final int line, final QName qname, final SchemaPath schemaPath) { + final Builder parent = getActualNode(); if (!(parent instanceof RpcDefinitionBuilder)) { throw new YangParseException(name, line, "input can be defined only in rpc statement"); } final RpcDefinitionBuilder rpc = (RpcDefinitionBuilder) parent; - final ContainerSchemaNodeBuilder inputBuilder = new ContainerSchemaNodeBuilder(inputQName, line); + final ContainerSchemaNodeBuilder inputBuilder = new ContainerSchemaNodeBuilder(name, line, qname, schemaPath); + inputBuilder.setParent(rpc); + rpc.setInput(inputBuilder); return inputBuilder; } - public ContainerSchemaNodeBuilder addRpcOutput(final QName outputQName, final int line) { + public ContainerSchemaNodeBuilder addRpcOutput(final SchemaPath schemaPath, final QName qname, final int line) { final Builder parent = actualPath.getFirst(); if (!(parent instanceof RpcDefinitionBuilder)) { throw new YangParseException(name, line, "output can be defined only in rpc statement"); } final RpcDefinitionBuilder rpc = (RpcDefinitionBuilder) parent; - final ContainerSchemaNodeBuilder outputBuilder = new ContainerSchemaNodeBuilder(outputQName, line); + final ContainerSchemaNodeBuilder outputBuilder = new ContainerSchemaNodeBuilder(name, line, qname, schemaPath); + outputBuilder.setParent(rpc); + rpc.setOutput(outputBuilder); return outputBuilder; } - public NotificationBuilder addNotification(final QName notificationName, final List parentPath, - final int line) { + public NotificationBuilder addNotification(final int line, final QName qname) { if (!(actualPath.isEmpty())) { throw new YangParseException(name, line, "notification can be defined only in module or submodule"); } - final NotificationBuilder builder = new NotificationBuilder(notificationName, line); - final List notificationPath = new ArrayList(parentPath); - notificationPath.add(notificationName.getLocalName()); + String notificationName = qname.getLocalName(); + for (NotificationBuilder nb : addedNotifications) { + if (nb.getQName().equals(qname)) { + throw new YangParseException(name, line, "notification with same name '" + notificationName + + "' already declared at line " + nb.getLine()); + } + } + for (RpcDefinitionBuilder rpc : addedRpcs) { + if (rpc.getQName().getLocalName().equals(notificationName)) { + throw new YangParseException(name, line, "Can not add notification: rpc with same name '" + + notificationName + "' already declared at line " + rpc.getLine()); + } + } + for (DataSchemaNodeBuilder addedChild : addedChildNodes) { + if (addedChild.getQName().getLocalName().equals(notificationName)) { + throw new YangParseException(name, line, "Can not add notification: node with same name '" + + notificationName + "' already declared at line " + addedChild.getLine()); + } + } + + final NotificationBuilder builder = new NotificationBuilder(name, line, qname); addedNotifications.add(builder); return builder; } - public FeatureBuilder addFeature(final QName featureName, final List parentPath, final int line) { - if (!(actualPath.isEmpty())) { + public FeatureBuilder addFeature(final int line, final QName qname) { + Builder parent = getActualNode(); + if (parent != null) { throw new YangParseException(name, line, "feature can be defined only in module or submodule"); } - final List pathToFeature = new ArrayList(parentPath); - pathToFeature.add(featureName.getLocalName()); + final FeatureBuilder builder = new FeatureBuilder(name, line, qname); - final FeatureBuilder builder = new FeatureBuilder(featureName, line); - addedFeatures.put(pathToFeature, builder); + String featureName = qname.getLocalName(); + for (FeatureBuilder addedFeature : addedFeatures) { + if (addedFeature.getQName().getLocalName().equals(featureName)) { + throw new YangParseException(name, line, "feature with same name '" + featureName + + "' already declared at line " + addedFeature.getLine()); + } + } + addedFeatures.add(builder); return builder; } - public ChoiceBuilder addChoice(final QName choiceName, final List parentPath, final int line) { - final List pathToChoice = new ArrayList(parentPath); - final ChoiceBuilder builder = new ChoiceBuilder(choiceName, line); + public ChoiceBuilder addChoice(final int line, final QName qname) { + final ChoiceBuilder builder = new ChoiceBuilder(name, line, qname); - if (!(actualPath.isEmpty())) { - final Builder parent = actualPath.getFirst(); - if (parent instanceof DataNodeContainerBuilder) { - if (parent instanceof AugmentationSchemaBuilder) { - builder.setAugmenting(true); - } - ((DataNodeContainerBuilder) parent).addChildNode(builder); - } else { - throw new YangParseException(name, line, "Unresolved parent of choice " + choiceName.getLocalName()); - } - } - - pathToChoice.add(choiceName.getLocalName()); - childNodes.put(pathToChoice, builder); + Builder parent = getActualNode(); + builder.setParent(parent); + addChildToParent(parent, builder, qname.getLocalName()); return builder; } - public ChoiceCaseBuilder addCase(final QName caseName, final List parentPath, final int line) { - final List pathToCase = new ArrayList(parentPath); - final ChoiceCaseBuilder builder = new ChoiceCaseBuilder(caseName, line); - - if (actualPath.isEmpty()) { + public ChoiceCaseBuilder addCase(final int line, final QName qname) { + Builder parent = getActualNode(); + if (parent == null) { throw new YangParseException(name, line, "'case' parent not found"); - } else { - final Builder parent = actualPath.getFirst(); - if (parent instanceof ChoiceBuilder) { - ((ChoiceBuilder) parent).addChildNode(builder); - } else if (parent instanceof AugmentationSchemaBuilder) { - builder.setAugmenting(true); - ((AugmentationSchemaBuilder) parent).addChildNode(builder); - } else { - throw new YangParseException(name, line, "Unresolved parent of 'case' " + caseName.getLocalName()); - } } - pathToCase.add(caseName.getLocalName()); - childNodes.put(pathToCase, builder); + final ChoiceCaseBuilder builder = new ChoiceCaseBuilder(name, line, qname); + builder.setParent(parent); + + if (parent instanceof ChoiceBuilder) { + ((ChoiceBuilder) parent).addCase(builder); + } else if (parent instanceof AugmentationSchemaBuilder) { + ((AugmentationSchemaBuilder) parent).addChildNode(builder); + } else { + throw new YangParseException(name, line, "Unresolved parent of 'case' " + qname.getLocalName()); + } return builder; } - public AnyXmlBuilder addAnyXml(final QName anyXmlName, final List parentPath, final int line) { - final List pathToAnyXml = new ArrayList(parentPath); - final AnyXmlBuilder builder = new AnyXmlBuilder(anyXmlName, line); - updateParent(builder, line, "anyxml"); + public AnyXmlBuilder addAnyXml(final int line, final QName qname, final SchemaPath schemaPath) { + final AnyXmlBuilder builder = new AnyXmlBuilder(name, line, qname, schemaPath); - pathToAnyXml.add(anyXmlName.getLocalName()); - childNodes.put(pathToAnyXml, builder); + Builder parent = getActualNode(); + builder.setParent(parent); + addChildToParent(parent, builder, qname.getLocalName()); return builder; } - public TypeDefinitionBuilderImpl addTypedef(final QName typeDefName, final List parentPath, final int line) { - final List pathToType = new ArrayList(parentPath); - final TypeDefinitionBuilderImpl builder = new TypeDefinitionBuilderImpl(typeDefName, line); + @Override + public void addTypedef(TypeDefinitionBuilder typedefBuilder) { + String nodeName = typedefBuilder.getQName().getLocalName(); + for (TypeDefinitionBuilder tdb : addedTypedefs) { + if (tdb.getQName().getLocalName().equals(nodeName)) { + throw new YangParseException(name, typedefBuilder.getLine(), "typedef with same name '" + nodeName + + "' already declared at line " + tdb.getLine()); + } + } + addedTypedefs.add(typedefBuilder); + } - if (!(actualPath.isEmpty())) { - final Builder parent = actualPath.getFirst(); - if (parent instanceof TypeDefinitionAwareBuilder) { - ((TypeDefinitionAwareBuilder) parent).addTypedef(builder); + public TypeDefinitionBuilderImpl addTypedef(final int line, final QName qname) { + final TypeDefinitionBuilderImpl builder = new TypeDefinitionBuilderImpl(name, line, qname); + + Builder parent = getActualNode(); + builder.setParent(parent); + + String typedefName = qname.getLocalName(); + if (parent == null) { + for (TypeDefinitionBuilder tdb : addedTypedefs) { + if (tdb.getQName().getLocalName().equals(typedefName)) { + throw new YangParseException(name, line, "typedef with same name '" + typedefName + + "' already declared at line " + tdb.getLine()); + } + } + addedTypedefs.add(builder); + } else { + if (parent instanceof DataNodeContainerBuilder) { + DataNodeContainerBuilder parentNode = (DataNodeContainerBuilder) parent; + for (TypeDefinitionBuilder child : parentNode.getTypeDefinitionBuilders()) { + if (child.getQName().getLocalName().equals(typedefName)) { + throw new YangParseException(name, line, "typedef with same name '" + typedefName + + "' already declared at line " + child.getLine()); + } + } + parentNode.addTypedef(builder); + } else if (parent instanceof RpcDefinitionBuilder) { + RpcDefinitionBuilder rpcParent = (RpcDefinitionBuilder) parent; + for (TypeDefinitionBuilder tdb : rpcParent.getTypeDefinitions()) { + if (tdb.getQName().getLocalName().equals(builder.getQName().getLocalName())) { + throw new YangParseException(name, line, "typedef with same name '" + typedefName + + "' already declared at line " + tdb.getLine()); + } + } + rpcParent.addTypedef(builder); } else { - throw new YangParseException(name, line, "Unresolved parent of typedef " + typeDefName.getLocalName()); + throw new YangParseException(name, line, "Unresolved parent of typedef " + typedefName); } } - pathToType.add(typeDefName.getLocalName()); - addedTypedefs.put(pathToType, builder); return builder; } - public void setType(final TypeDefinition type, final List parentPath) { - if (!(actualPath.isEmpty())) { - final Builder parent = actualPath.getFirst(); - if (parent instanceof TypeAwareBuilder) { - ((TypeAwareBuilder) parent).setType(type); - } else { - throw new YangParseException("Failed to set type '" + type.getQName().getLocalName() - + "'. Unknown parent node: " + parent); - } + public void setType(final TypeDefinition type) { + Builder parent = getActualNode(); + if (parent == null || !(parent instanceof TypeAwareBuilder)) { + throw new YangParseException("Failed to set type '" + type.getQName().getLocalName() + + "'. Invalid parent node: " + parent); } + ((TypeAwareBuilder) parent).setType(type); } - public UnionTypeBuilder addUnionType(final List currentPath, final URI namespace, final Date revision, - final int line) { - final List pathToUnion = new ArrayList(currentPath); - final UnionTypeBuilder union = new UnionTypeBuilder(line); - - if (actualPath.isEmpty()) { - throw new YangParseException(line, "union error"); + public UnionTypeBuilder addUnionType(final int line, final URI namespace, final Date revision) { + final Builder parent = getActualNode(); + if (parent == null) { + throw new YangParseException(name, line, "Unresolved parent of union type"); } else { - final Builder parent = actualPath.getFirst(); + final UnionTypeBuilder union = new UnionTypeBuilder(name, line); if (parent instanceof TypeAwareBuilder) { - ((TypeAwareBuilder) parent).setTypedef(union); - - final List path = new ArrayList(pathToUnion); - path.add("union"); - - addedUnionTypes.put(path, union); return union; } else { - throw new YangParseException(name, line, "Unresolved parent of union type."); + throw new YangParseException(name, line, "Invalid parent of union type."); } } } - public void addIdentityrefType(final String baseString, final List parentPath, final SchemaPath schemaPath, - final int line) { - final List pathToIdentityref = new ArrayList(parentPath); - final IdentityrefTypeBuilder identityref = new IdentityrefTypeBuilder(baseString, schemaPath, line); + public void addIdentityrefType(final int line, final SchemaPath schemaPath, final String baseString) { + final IdentityrefTypeBuilder identityref = new IdentityrefTypeBuilder(name, line, baseString, schemaPath); - if (actualPath.isEmpty()) { - throw new YangParseException(line, "identityref error"); + final Builder parent = getActualNode(); + if (parent == null) { + throw new YangParseException(name, line, "Unresolved parent of identityref type."); } else { - final Builder parent = actualPath.getFirst(); if (parent instanceof TypeAwareBuilder) { final TypeAwareBuilder typeParent = (TypeAwareBuilder) parent; typeParent.setTypedef(identityref); - dirtyNodes.put(pathToIdentityref, typeParent); + dirtyNodes.add(typeParent); } else { - throw new YangParseException(name, line, "Unresolved parent of identityref type."); + throw new YangParseException(name, line, "Invalid parent of identityref type."); } } } - public DeviationBuilder addDeviation(final String targetPath, final List parentPath, final int line) { - if (!(actualPath.isEmpty())) { + public DeviationBuilder addDeviation(final int line, final String targetPath) { + Builder parent = getActualNode(); + if (parent != null) { throw new YangParseException(name, line, "deviation can be defined only in module or submodule"); } - final List pathToDeviation = new ArrayList(parentPath); - pathToDeviation.add(targetPath); - final DeviationBuilder builder = new DeviationBuilder(targetPath, line); - addedDeviations.put(pathToDeviation, builder); + final DeviationBuilder builder = new DeviationBuilder(name, line, targetPath); + addedDeviations.add(builder); return builder; } public IdentitySchemaNodeBuilder addIdentity(final QName qname, final List parentPath, final int line) { - if (!(actualPath.isEmpty())) { + Builder parent = getActualNode(); + if (parent != null) { throw new YangParseException(name, line, "identity can be defined only in module or submodule"); } + String identityName = qname.getLocalName(); + for (IdentitySchemaNodeBuilder idBuilder : addedIdentities) { + if (idBuilder.getQName().equals(qname)) { + throw new YangParseException(name, line, "identity with same name '" + identityName + + "' already declared at line " + idBuilder.getLine()); + } + } - final List pathToIdentity = new ArrayList(parentPath); - final IdentitySchemaNodeBuilder builder = new IdentitySchemaNodeBuilder(qname, line); - pathToIdentity.add(qname.getLocalName()); + final IdentitySchemaNodeBuilder builder = new IdentitySchemaNodeBuilder(name, line, qname); addedIdentities.add(builder); return builder; } - public void addConfiguration(final boolean configuration, final List parentPath, final int line) { - if (actualPath.isEmpty()) { - throw new YangParseException(name, line, "Parent node of config statement not found."); - } else { - final Builder parent = actualPath.getFirst(); - if (parent instanceof DataSchemaNodeBuilder) { - ((DataSchemaNodeBuilder) parent).setConfiguration(configuration); - } else if (parent instanceof RefineHolder) { - ((RefineHolder) parent).setConfig(configuration); - } else if (parent instanceof DeviationBuilder) { - // skip: set config to deviation (deviate stmt) not supported by - // current api - return; - } else { - throw new YangParseException(name, line, "Unresolved parent of config statement."); - } - } + @Override + public void addUnknownNodeBuilder(final UnknownSchemaNodeBuilder builder) { + addedUnknownNodes.add(builder); + allUnknownNodes.add(builder); } - public UnknownSchemaNodeBuilder addUnknownSchemaNode(final QName qname, final List parentPath, - final int line) { - final UnknownSchemaNodeBuilder builder = new UnknownSchemaNodeBuilder(qname, line); + public UnknownSchemaNodeBuilder addUnknownSchemaNode(final int line, final QName qname) { + final Builder parent = getActualNode(); + final UnknownSchemaNodeBuilder builder = new UnknownSchemaNodeBuilder(name, line, qname); + builder.setParent(parent); + allUnknownNodes.add(builder); - if (!(actualPath.isEmpty())) { - final Builder parent = actualPath.getFirst(); + if (parent == null) { + addedUnknownNodes.add(builder); + } else { if (parent instanceof SchemaNodeBuilder) { - ((SchemaNodeBuilder) parent).addUnknownSchemaNode(builder); + ((SchemaNodeBuilder) parent).addUnknownNodeBuilder(builder); + } else if (parent instanceof DataNodeContainerBuilder) { + ((DataNodeContainerBuilder) parent).addUnknownNodeBuilder(builder); } else if (parent instanceof RefineHolder) { - ((RefineHolder) parent).addUnknownSchemaNode(builder); + ((RefineHolder) parent).addUnknownNodeBuilder(builder); } else { throw new YangParseException(name, line, "Unresolved parent of unknown node '" + qname.getLocalName() + "'"); } } - final List unPath = new ArrayList(parentPath); - unPath.add(qname.getLocalName()); - addedUnknownNodes.put(unPath, builder); + return builder; } @Override public String toString() { - return ModuleBuilder.class.getSimpleName() + "[" + name + "]"; + return "module " + name; } private final class ModuleImpl implements Module { @@ -900,7 +969,7 @@ public class ModuleBuilder implements Builder { @Override public Set getChildNodes() { - return new HashSet(childNodes.values()); + return new LinkedHashSet(childNodes.values()); } private void setChildNodes(Map childNodes) { @@ -1057,19 +1126,65 @@ public class ModuleBuilder implements Builder { } } - private void updateParent(DataSchemaNodeBuilder nodeBuilder, int line, String nodeTypeName) { - if (!(actualPath.isEmpty())) { - final Builder parent = actualPath.getFirst(); + /** + * Add child to parent. Method checks for duplicates and add given child + * node to parent. If node with same name is found, throws exception. If + * parent is null, child node will be added directly to module. + * + * @param parent + * @param child + * @param childName + */ + private void addChildToParent(final Builder parent, final DataSchemaNodeBuilder child, final String childName) { + final int line = child.getLine(); + if (parent == null) { + // if parent == null => node is defined under module + // All leafs, leaf-lists, lists, containers, choices, rpcs, + // notifications, and anyxmls defined within a parent node or at the + // top level of the module or its submodules share the same + // identifier namespace. + for (DataSchemaNodeBuilder childNode : addedChildNodes) { + if (childNode.getQName().getLocalName().equals(childName)) { + throw new YangParseException(name, line, "Can not add '" + child + + "': node with same name already declared at line " + childNode.getLine()); + } + } + for (RpcDefinitionBuilder rpc : addedRpcs) { + if (rpc.getQName().getLocalName().equals(childName)) { + throw new YangParseException(name, line, "Can not add '" + child + + "': rpc with same name already declared at line " + rpc.getLine()); + } + } + for (NotificationBuilder notification : addedNotifications) { + if (notification.getQName().getLocalName().equals(childName)) { + throw new YangParseException(name, line, "Can not add '" + child + + "': notification with same name already declared at line " + notification.getLine()); + } + } + addedChildNodes.add(child); + } else { + // no need for checking rpc and notification because they can be + // defined only under module or submodule if (parent instanceof DataNodeContainerBuilder) { - if (parent instanceof AugmentationSchemaBuilder) { - nodeBuilder.setAugmenting(true); + DataNodeContainerBuilder parentNode = (DataNodeContainerBuilder) parent; + for (DataSchemaNodeBuilder childNode : parentNode.getChildNodeBuilders()) { + if (childNode.getQName().getLocalName().equals(childName)) { + throw new YangParseException(name, line, "Can not add '" + child + "': node with same name '" + + childName + "' already declared at line " + childNode.getLine()); + } } - ((DataNodeContainerBuilder) parent).addChildNode(nodeBuilder); + parentNode.addChildNode(child); } else if (parent instanceof ChoiceBuilder) { - ((ChoiceBuilder) parent).addChildNode(nodeBuilder); + ChoiceBuilder parentNode = (ChoiceBuilder) parent; + for (ChoiceCaseBuilder caseBuilder : parentNode.getCases()) { + if (caseBuilder.getQName().getLocalName().equals(childName)) { + throw new YangParseException(name, line, "Can not add '" + child + "': case with same name '" + + childName + "' already declared at line " + caseBuilder.getLine()); + } + } + parentNode.addCase(child); } else { - throw new YangParseException(name, line, "Unresolved parent of " + nodeTypeName + " " - + nodeBuilder.getQName().getLocalName()); + throw new YangParseException(name, line, "Unresolved parent of node '" + childName + "'."); } } } @@ -1145,131 +1260,4 @@ public class ModuleBuilder implements Builder { return moduleImport; } - /** - * Traverse through given addedChilds and add only direct module childs. - * Direct module child path size is 2 (1. module name, 2. child name). - * - * @param addedChilds - * @return map of children, where key is child QName and value is child - * itself - */ - private Map buildModuleChildNodes(Map, DataSchemaNodeBuilder> addedChilds) { - final Map childNodes = new HashMap(); - for (Map.Entry, DataSchemaNodeBuilder> entry : addedChilds.entrySet()) { - List path = entry.getKey(); - DataSchemaNodeBuilder child = entry.getValue(); - if (path.size() == 2) { - DataSchemaNode node = child.build(); - QName qname = node.getQName(); - childNodes.put(qname, node); - } - } - return childNodes; - } - - /** - * Traverse through given addedGroupings and add only direct module - * groupings. Direct module grouping path size is 2 (1. module name, 2. - * grouping name). - * - * @param addedGroupings - * @return set of built GroupingDefinition objects - */ - private Set buildModuleGroupings(Map, GroupingBuilder> addedGroupings) { - final Set groupings = new HashSet(); - for (Map.Entry, GroupingBuilder> entry : addedGroupings.entrySet()) { - if (entry.getKey().size() == 2) { - groupings.add(entry.getValue().build()); - } - } - return groupings; - } - - /** - * Traverse through given addedRpcs and build RpcDefinition objects. - * - * @param addedRpcs - * @return set of built RpcDefinition objects - */ - private Set buildModuleRpcs(Map, RpcDefinitionBuilder> addedRpcs) { - final Set rpcs = new HashSet(); - RpcDefinitionBuilder builder; - for (Map.Entry, RpcDefinitionBuilder> entry : addedRpcs.entrySet()) { - builder = entry.getValue(); - RpcDefinition rpc = builder.build(); - rpcs.add(rpc); - } - return rpcs; - } - - /** - * Traverse through given addedTypedefs and add only direct module typedef - * statements. Direct module typedef path size is 2 (1. module name, 2. - * typedef name). - * - * @param addedTypedefs - * @return set of built module typedef statements - */ - private Set> buildModuleTypedefs(Map, TypeDefinitionBuilder> addedTypedefs) { - Set> typedefs = new HashSet>(); - for (Map.Entry, TypeDefinitionBuilder> entry : addedTypedefs.entrySet()) { - List key = entry.getKey(); - TypeDefinitionBuilder typedefBuilder = entry.getValue(); - if (key.size() == 2) { - TypeDefinition> node = typedefBuilder.build(); - typedefs.add(node); - } - } - return typedefs; - } - - /** - * Traverse through given addedUsesNodes and add only direct module uses - * nodes. Direct module uses node path size is 2 (1. module name, 2. uses - * name). - * - * @param addedUsesNodes - * @return set of built module uses nodes - */ - private Set buildUsesNodes(Map, UsesNodeBuilder> addedUsesNodes) { - final Set usesNodeDefs = new HashSet(); - for (Map.Entry, UsesNodeBuilder> entry : addedUsesNodes.entrySet()) { - if (entry.getKey().size() == 2) { - usesNodeDefs.add(entry.getValue().build()); - } - } - return usesNodeDefs; - } - - /** - * Traverse through given addedFeatures and add only direct module features. - * Direct module feature path size is 2 (1. module name, 2. feature name). - * - * @param addedFeatures - * @return set of built module features - */ - private Set buildModuleFeatures(Map, FeatureBuilder> addedFeatures) { - Set features = new HashSet(); - for (Map.Entry, FeatureBuilder> entry : addedFeatures.entrySet()) { - if (entry.getKey().size() == 2) { - features.add(entry.getValue().build()); - } - } - return features; - } - - private List buildModuleUnknownNodes( - final Map, UnknownSchemaNodeBuilder> addedUnknownNodes) { - final List unknownNodes = new ArrayList(); - for (Map.Entry, UnknownSchemaNodeBuilder> entry : addedUnknownNodes.entrySet()) { - final List path = entry.getKey(); - final UnknownSchemaNodeBuilder child = entry.getValue(); - if (path.size() == 2) { - final UnknownSchemaNode node = child.build(); - unknownNodes.add(node); - } - } - return unknownNodes; - } - }