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=19c94a3f3365bc059674c574f19e061161e2138f;hpb=a640c5c549376e5d72038e033d49ef6f0df96c92;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 19c94a3f33..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,86 +24,136 @@ 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 class GroupingBuilderImpl implements GroupingBuilder { +public final class GroupingBuilderImpl extends AbstractDataNodeContainerBuilder implements GroupingBuilder { + private boolean isBuilt; private final GroupingDefinitionImpl instance; - private final int line; private SchemaPath schemaPath; - private final Set childNodes = new HashSet(); - private final Set groupings = new HashSet(); + private String description; + private String reference; + private Status status = Status.CURRENT; + private boolean addedByUses; + + private Set> typedefs; private final Set addedTypedefs = new HashSet(); - private final Set usesNodes = new HashSet(); - private final List addedUnknownNodes = new ArrayList(); - GroupingBuilderImpl(final QName qname, final int line) { - this.instance = new GroupingDefinitionImpl(qname); - this.line = line; + private Set usesNodes; + private final Set addedUsesNodes = new HashSet(); + + public GroupingBuilderImpl(final String moduleName, final int line, final QName qname) { + super(moduleName, line, qname); + instance = new GroupingDefinitionImpl(qname); + } + + 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 public GroupingDefinition build() { - instance.setPath(schemaPath); + if (!isBuilt) { + instance.setPath(schemaPath); + instance.setDescription(description); + instance.setReference(reference); + instance.setStatus(status); + instance.setAddedByUses(addedByUses); + + // CHILD NODES + 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) { + childs.put(node.getQName(), node); + } + } + instance.setChildNodes(childs); - // CHILD NODES - final Map childs = new HashMap(); - for (DataSchemaNodeBuilder node : childNodes) { - childs.put(node.getQName(), node.build()); - } - instance.setChildNodes(childs); + // GROUPINGS + if (groupings == null) { + groupings = new TreeSet(Comparators.SCHEMA_NODE_COMP); + for (GroupingBuilder builder : addedGroupings) { + groupings.add(builder.build()); + } + } + instance.setGroupings(groupings); - // GROUPINGS - final Set groupingDefs = new HashSet(); - for (GroupingBuilder builder : groupings) { - groupingDefs.add(builder.build()); - } - instance.setGroupings(groupingDefs); + // TYPEDEFS + if (typedefs == null) { + typedefs = new TreeSet>(Comparators.SCHEMA_NODE_COMP); + for (TypeDefinitionBuilder entry : addedTypedefs) { + typedefs.add(entry.build()); + } + } + instance.setTypeDefinitions(typedefs); - // TYPEDEFS - final Set> typedefs = new HashSet>(); - for (TypeDefinitionBuilder entry : addedTypedefs) { - typedefs.add(entry.build()); - } - instance.setTypeDefinitions(typedefs); + // USES + if (usesNodes == null) { + usesNodes = new HashSet(); + for (UsesNodeBuilder builder : addedUsesNodes) { + usesNodes.add(builder.build()); + } + } + instance.setUses(usesNodes); - // USES - final Set usesNodeDefs = new HashSet(); - for (UsesNodeBuilder builder : usesNodes) { - usesNodeDefs.add(builder.build()); - } - instance.setUses(usesNodeDefs); + // UNKNOWN NODES + if (unknownNodes == null) { + unknownNodes = new ArrayList(); + for (UnknownSchemaNodeBuilder b : addedUnknownNodes) { + unknownNodes.add(b.build()); + } + Collections.sort(unknownNodes, Comparators.SCHEMA_NODE_COMP); + } + instance.setUnknownSchemaNodes(unknownNodes); - // UNKNOWN NODES - final List unknownNodes = new ArrayList(); - for(UnknownSchemaNodeBuilder b : addedUnknownNodes) { - unknownNodes.add(b.build()); + isBuilt = true; } - instance.setUnknownSchemaNodes(unknownNodes); return instance; } - @Override - public int getLine() { - return line; - } - /** - * Always returns null. - */ @Override - public QName getQName() { - return null; + 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); } + public void setTypedefs(final Set> typedefs) { + this.typedefs = typedefs; + } + @Override public SchemaPath getPath() { return schemaPath; @@ -113,64 +164,72 @@ public class GroupingBuilderImpl implements GroupingBuilder { this.schemaPath = schemaPath; } + @Override + public String getDescription() { + return description; + } + @Override public void setDescription(final String description) { - instance.setDescription(description); + this.description = description; + } + + @Override + public String getReference() { + return reference; } @Override public void setReference(final String reference) { - instance.setReference(reference); + this.reference = reference; } @Override - public void setStatus(final Status status) { - instance.setStatus(status); + public Status getStatus() { + return status; } @Override - public DataSchemaNodeBuilder getChildNode(String name) { - DataSchemaNodeBuilder result = null; - for(DataSchemaNodeBuilder node : childNodes) { - if(node.getQName().getLocalName().equals(name)) { - result = node; - break; - } - } - return result; + public void setStatus(final Status status) { + this.status = status; } @Override - public void addChildNode(final DataSchemaNodeBuilder childNode) { - childNodes.add(childNode); + public boolean isAddedByUses() { + return addedByUses; } @Override - public Set getChildNodes() { - return childNodes; + public void setAddedByUses(final boolean addedByUses) { + this.addedByUses = addedByUses; } @Override - public void addGrouping(final GroupingBuilder grouping) { - groupings.add(grouping); + public Set getUses() { + return addedUsesNodes; } @Override public void addUsesNode(final UsesNodeBuilder usesBuilder) { - usesNodes.add(usesBuilder); + addedUsesNodes.add(usesBuilder); + } + + public void setUsesnodes(final Set usesNodes) { + this.usesNodes = usesNodes; } @Override - public void addUnknownSchemaNode(final UnknownSchemaNodeBuilder unknownNode) { - addedUnknownNodes.add(unknownNode); + public String toString() { + return "grouping " + qname.getLocalName(); } - private static class GroupingDefinitionImpl implements GroupingDefinition { + 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(); @@ -222,9 +281,20 @@ public 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) { @@ -264,7 +334,7 @@ public class GroupingBuilderImpl implements GroupingBuilder { } private void setUnknownSchemaNodes(List unknownNodes) { - if(unknownNodes != null) { + if (unknownNodes != null) { this.unknownNodes = unknownNodes; } } @@ -326,8 +396,7 @@ public 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("]");