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%2Fparser%2Fbuilder%2Fimpl%2FGroupingBuilderImpl.java;h=8a8f1211cb474c3894852d566abd6197a34b13f5;hb=dd018bda91b9c3cd222aaa1bd2d8f734152571e8;hp=5428259324a700a5c65ed9ac8378d0dd4df4e7ef;hpb=b8bb7db7c6133e00046e85ead70426eb1e05184d;p=controller.git diff --git a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/GroupingBuilderImpl.java b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/GroupingBuilderImpl.java index 5428259324..8a8f1211cb 100644 --- a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/GroupingBuilderImpl.java +++ b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/GroupingBuilderImpl.java @@ -9,11 +9,12 @@ package org.opendaylight.controller.yang.parser.builder.impl; import java.util.ArrayList; import java.util.Collections; -import java.util.HashMap; import java.util.HashSet; 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.DataSchemaNode; @@ -23,26 +24,22 @@ import org.opendaylight.controller.yang.model.api.Status; 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.DataSchemaNodeBuilder; import org.opendaylight.controller.yang.parser.builder.api.GroupingBuilder; 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.YangParseException; -public final class GroupingBuilderImpl implements GroupingBuilder { +public final class GroupingBuilderImpl extends AbstractDataNodeContainerBuilder implements GroupingBuilder { private boolean isBuilt; private final GroupingDefinitionImpl instance; - private final int line; - private final QName qname; private SchemaPath schemaPath; private String description; private String reference; private Status status = Status.CURRENT; - - private Set childNodes; - private final Set addedChildNodes = new HashSet(); - - private Set groupings; - private final Set addedGroupings = new HashSet(); + private boolean addedByUses; private Set> typedefs; private final Set addedTypedefs = new HashSet(); @@ -50,13 +47,26 @@ public final class GroupingBuilderImpl implements GroupingBuilder { private Set usesNodes; private final Set addedUsesNodes = new HashSet(); - private List unknownNodes; - private final List addedUnknownNodes = new ArrayList(); + public GroupingBuilderImpl(final String moduleName, final int line, final QName qname) { + super(moduleName, line, qname); + instance = new GroupingDefinitionImpl(qname); + } - public GroupingBuilderImpl(final QName qname, final int line) { - this.qname = qname; - this.instance = new GroupingDefinitionImpl(qname); - this.line = line; + public GroupingBuilderImpl(GroupingBuilder builder) { + super(builder.getModuleName(), builder.getLine(), builder.getQName()); + parent = builder.getParent(); + instance = new GroupingDefinitionImpl(qname); + schemaPath = builder.getPath(); + description = builder.getDescription(); + reference = builder.getReference(); + status = builder.getStatus(); + addedByUses = builder.isAddedByUses(); + childNodes = builder.getChildNodes(); + addedChildNodes.addAll(builder.getChildNodeBuilders()); + groupings = builder.getGroupings(); + addedGroupings.addAll(builder.getGroupingBuilders()); + addedUsesNodes.addAll(builder.getUses()); + addedUnknownNodes.addAll(builder.getUnknownNodeBuilders()); } @Override @@ -66,23 +76,24 @@ public final class GroupingBuilderImpl implements GroupingBuilder { instance.setDescription(description); instance.setReference(reference); instance.setStatus(status); + instance.setAddedByUses(addedByUses); // CHILD NODES - final Map childs = new HashMap(); - if(childNodes == null) { + final Map childs = new TreeMap(Comparators.QNAME_COMP); + if (childNodes == null || childNodes.isEmpty()) { for (DataSchemaNodeBuilder node : addedChildNodes) { childs.put(node.getQName(), node.build()); } } else { - for(DataSchemaNode node : childNodes) { + for (DataSchemaNode node : childNodes) { childs.put(node.getQName(), node); } } instance.setChildNodes(childs); // GROUPINGS - if(groupings == null) { - groupings = new HashSet(); + if (groupings == null) { + groupings = new TreeSet(Comparators.SCHEMA_NODE_COMP); for (GroupingBuilder builder : addedGroupings) { groupings.add(builder.build()); } @@ -90,8 +101,8 @@ public final class GroupingBuilderImpl implements GroupingBuilder { instance.setGroupings(groupings); // TYPEDEFS - if(typedefs == null) { - typedefs = new HashSet>(); + if (typedefs == null) { + typedefs = new TreeSet>(Comparators.SCHEMA_NODE_COMP); for (TypeDefinitionBuilder entry : addedTypedefs) { typedefs.add(entry.build()); } @@ -99,7 +110,7 @@ public final class GroupingBuilderImpl implements GroupingBuilder { instance.setTypeDefinitions(typedefs); // USES - if(usesNodes == null) { + if (usesNodes == null) { usesNodes = new HashSet(); for (UsesNodeBuilder builder : addedUsesNodes) { usesNodes.add(builder.build()); @@ -108,11 +119,12 @@ public final class GroupingBuilderImpl implements GroupingBuilder { instance.setUses(usesNodes); // UNKNOWN NODES - if(unknownNodes == null) { + if (unknownNodes == null) { unknownNodes = new ArrayList(); for (UnknownSchemaNodeBuilder b : addedUnknownNodes) { unknownNodes.add(b.build()); } + Collections.sort(unknownNodes, Comparators.SCHEMA_NODE_COMP); } instance.setUnknownSchemaNodes(unknownNodes); @@ -122,23 +134,19 @@ public final class GroupingBuilderImpl implements GroupingBuilder { return instance; } - @Override - public int getLine() { - return line; - } @Override - public QName getQName() { - return qname; - } - - @Override - public Set getTypeDefinitions() { + public Set getTypeDefinitionBuilders() { return addedTypedefs; } @Override public void addTypedef(final TypeDefinitionBuilder type) { + String typeName = type.getQName().getLocalName(); + for (TypeDefinitionBuilder addedTypedef : addedTypedefs) { + throw new YangParseException(moduleName, type.getLine(), "Can not add typedef '" + typeName + + "': typedef with same name already declared at line " + addedTypedef.getLine()); + } addedTypedefs.add(type); } @@ -187,43 +195,13 @@ public final class GroupingBuilderImpl implements GroupingBuilder { } @Override - public DataSchemaNodeBuilder getChildNode(String name) { - DataSchemaNodeBuilder result = null; - for (DataSchemaNodeBuilder node : addedChildNodes) { - if (node.getQName().getLocalName().equals(name)) { - result = node; - break; - } - } - return result; - } - - @Override - public void addChildNode(final DataSchemaNodeBuilder childNode) { - addedChildNodes.add(childNode); - } - - @Override - public Set getChildNodes() { - return addedChildNodes; - } - - public void setChildNodes(final Set childNodes) { - this.childNodes = childNodes; - } - - @Override - public Set getGroupings() { - return addedGroupings; + public boolean isAddedByUses() { + return addedByUses; } @Override - public void addGrouping(final GroupingBuilder grouping) { - addedGroupings.add(grouping); - } - - public void setGroupings(final Set groupings) { - this.groupings = groupings; + public void setAddedByUses(final boolean addedByUses) { + this.addedByUses = addedByUses; } @Override @@ -241,26 +219,17 @@ public final class GroupingBuilderImpl implements GroupingBuilder { } @Override - public List getUnknownNodes() { - return addedUnknownNodes; - } - - @Override - public void addUnknownSchemaNode(final UnknownSchemaNodeBuilder unknownNode) { - addedUnknownNodes.add(unknownNode); + public String toString() { + return "grouping " + qname.getLocalName(); } - public void setUnknownNodes(List unknownNodes) { - this.unknownNodes = unknownNodes; - } - - private final class GroupingDefinitionImpl implements GroupingDefinition { private final QName qname; private SchemaPath path; private String description; private String reference; private Status status; + private boolean addedByUses; private Map childNodes = Collections.emptyMap(); private Set groupings = Collections.emptySet(); private Set> typeDefinitions = Collections.emptySet(); @@ -312,9 +281,20 @@ public final class GroupingBuilderImpl implements GroupingBuilder { this.status = status; } + @Override + public boolean isAddedByUses() { + return addedByUses; + } + + private void setAddedByUses(final boolean addedByUses) { + this.addedByUses = addedByUses; + } + @Override public Set getChildNodes() { - return new HashSet(childNodes.values()); + final Set result = new TreeSet(Comparators.SCHEMA_NODE_COMP); + result.addAll(childNodes.values()); + return result; } private void setChildNodes(Map childNodes) { @@ -416,8 +396,7 @@ public final class GroupingBuilderImpl implements GroupingBuilder { @Override public String toString() { - StringBuilder sb = new StringBuilder( - GroupingDefinitionImpl.class.getSimpleName()); + StringBuilder sb = new StringBuilder(GroupingDefinitionImpl.class.getSimpleName()); sb.append("["); sb.append("qname=" + qname); sb.append("]");