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%2FGroupingBuilderImpl.java;h=20503488ce9802e019c99bd8e46f82e929d7f695;hp=cc7a05cd04b30ca0f683ff76cfc1319a48a84bb2;hb=0df356fd6dd1e24f82a4afaa6c824517d354fb20;hpb=d04b927ef78082525c3b0738126b6eb12e4a7a74 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 cc7a05cd04..20503488ce 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 @@ -14,6 +14,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.TreeSet; import org.opendaylight.controller.yang.common.QName; import org.opendaylight.controller.yang.model.api.DataSchemaNode; @@ -23,12 +24,15 @@ 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.Builder; 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; public final class GroupingBuilderImpl implements GroupingBuilder { + private Builder parent; private boolean isBuilt; private final GroupingDefinitionImpl instance; private final int line; @@ -36,19 +40,48 @@ public final class GroupingBuilderImpl implements GroupingBuilder { private SchemaPath schemaPath; private String description; private String reference; - private Status status; - private final Set childNodes = new HashSet(); - private final Set groupings = new HashSet(); + private Status status = Status.CURRENT; + private boolean addedByUses; + + private Set childNodes; + private final Set addedChildNodes = new HashSet(); + + private Set groupings; + private final Set addedGroupings = new HashSet(); + + private Set> typedefs; private final Set addedTypedefs = new HashSet(); - private final Set usesNodes = new HashSet(); + + private Set usesNodes; + private final Set addedUsesNodes = new HashSet(); + + private List unknownNodes; private final List addedUnknownNodes = new ArrayList(); public GroupingBuilderImpl(final QName qname, final int line) { this.qname = qname; - this.instance = new GroupingDefinitionImpl(qname); + instance = new GroupingDefinitionImpl(qname); this.line = line; } + public GroupingBuilderImpl(GroupingBuilder builder) { + qname = builder.getQName(); + parent = builder.getParent(); + instance = new GroupingDefinitionImpl(qname); + line = builder.getLine(); + 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() { if (!isBuilt) { @@ -56,39 +89,55 @@ 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(); - for (DataSchemaNodeBuilder node : childNodes) { - childs.put(node.getQName(), node.build()); + if (childNodes == null) { + for (DataSchemaNodeBuilder node : addedChildNodes) { + childs.put(node.getQName(), node.build()); + } + } else { + for (DataSchemaNode node : childNodes) { + childs.put(node.getQName(), node); + } } instance.setChildNodes(childs); // GROUPINGS - final Set groupingDefs = new HashSet(); - for (GroupingBuilder builder : groupings) { - groupingDefs.add(builder.build()); + if (groupings == null) { + groupings = new TreeSet(Comparators.SCHEMA_NODE_COMP); + for (GroupingBuilder builder : addedGroupings) { + groupings.add(builder.build()); + } } - instance.setGroupings(groupingDefs); + instance.setGroupings(groupings); // TYPEDEFS - final Set> typedefs = new HashSet>(); - for (TypeDefinitionBuilder entry : addedTypedefs) { - typedefs.add(entry.build()); + if (typedefs == null) { + typedefs = new TreeSet>(Comparators.SCHEMA_NODE_COMP); + for (TypeDefinitionBuilder entry : addedTypedefs) { + typedefs.add(entry.build()); + } } instance.setTypeDefinitions(typedefs); // USES - final Set usesNodeDefs = new HashSet(); - for (UsesNodeBuilder builder : usesNodes) { - usesNodeDefs.add(builder.build()); + if (usesNodes == null) { + usesNodes = new HashSet(); + for (UsesNodeBuilder builder : addedUsesNodes) { + usesNodes.add(builder.build()); + } } - instance.setUses(usesNodeDefs); + instance.setUses(usesNodes); // UNKNOWN NODES - final List unknownNodes = new ArrayList(); - for (UnknownSchemaNodeBuilder b : addedUnknownNodes) { - unknownNodes.add(b.build()); + if (unknownNodes == null) { + unknownNodes = new ArrayList(); + for (UnknownSchemaNodeBuilder b : addedUnknownNodes) { + unknownNodes.add(b.build()); + } + Collections.sort(unknownNodes, Comparators.SCHEMA_NODE_COMP); } instance.setUnknownSchemaNodes(unknownNodes); @@ -103,13 +152,23 @@ public final class GroupingBuilderImpl implements GroupingBuilder { return line; } + @Override + public Builder getParent() { + return parent; + } + + @Override + public void setParent(final Builder parent) { + this.parent = parent; + } + @Override public QName getQName() { return qname; } @Override - public Set getTypedefs() { + public Set getTypeDefinitionBuilders() { return addedTypedefs; } @@ -118,6 +177,10 @@ public final class GroupingBuilderImpl implements GroupingBuilder { addedTypedefs.add(type); } + public void setTypedefs(final Set> typedefs) { + this.typedefs = typedefs; + } + @Override public SchemaPath getPath() { return schemaPath; @@ -159,63 +222,103 @@ public final class GroupingBuilderImpl implements GroupingBuilder { } @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 boolean isAddedByUses() { + return addedByUses; } @Override - public void addChildNode(final DataSchemaNodeBuilder childNode) { - childNodes.add(childNode); + public void setAddedByUses(final boolean addedByUses) { + this.addedByUses = addedByUses; } @Override - public Set getChildNodes() { + public Set getChildNodes() { return childNodes; } @Override - public Set getGroupings() { - return groupings; + public void addChildNode(final DataSchemaNodeBuilder childNode) { + addedChildNodes.add(childNode); + } + + @Override + public Set getChildNodeBuilders() { + return addedChildNodes; + } + + @Override + public DataSchemaNodeBuilder getDataChildByName(final String name) { + for(DataSchemaNodeBuilder child : addedChildNodes) { + if(child.getQName().getLocalName().equals(name)) { + return child; + } + } + return null; + } + + public void setChildNodes(final Set childNodes) { + this.childNodes = childNodes; + } + + @Override + public Set getGroupings() { + return Collections.emptySet(); + } + + @Override + public Set getGroupingBuilders() { + return addedGroupings; } @Override public void addGrouping(final GroupingBuilder grouping) { - groupings.add(grouping); + addedGroupings.add(grouping); + } + + public void setGroupings(final Set groupings) { + this.groupings = groupings; } @Override public Set getUses() { - return usesNodes; + 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 List getUnknownNodes() { + public List getUnknownNodeBuilders() { return addedUnknownNodes; } @Override - public void addUnknownSchemaNode(final UnknownSchemaNodeBuilder unknownNode) { + public void addUnknownNodeBuilder(final UnknownSchemaNodeBuilder unknownNode) { addedUnknownNodes.add(unknownNode); } + public void setUnknownNodes(List unknownNodes) { + this.unknownNodes = unknownNodes; + } + + @Override + public String toString() { + return "grouping " + qname.getLocalName(); + } + 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(); @@ -267,9 +370,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) { @@ -371,8 +485,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("]");