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=0f7179e791eeb761cf1b7528e94a96728eff348c;hb=154b5dde1af41aff2ae0cc6e08400153162a4a3c;hp=5428259324a700a5c65ed9ac8378d0dd4df4e7ef;hpb=f0b551cfbf794966124da7475935c27c3e7311c0;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..0f7179e791 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; @@ -37,6 +41,7 @@ public final class GroupingBuilderImpl implements GroupingBuilder { private String description; private String reference; private Status status = Status.CURRENT; + private boolean addedByUses; private Set childNodes; private final Set addedChildNodes = new HashSet(); @@ -55,10 +60,28 @@ public final class GroupingBuilderImpl implements GroupingBuilder { 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.getUnknownNodes()); + } + @Override public GroupingDefinition build() { if (!isBuilt) { @@ -66,23 +89,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) { + if (childNodes == null) { 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 +114,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 +123,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 +132,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); @@ -127,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 getTypeDefinitions() { + public Set getTypeDefinitionBuilders() { return addedTypedefs; } @@ -186,6 +221,16 @@ public final class GroupingBuilderImpl implements GroupingBuilder { this.status = status; } + @Override + public boolean isAddedByUses() { + return addedByUses; + } + + @Override + public void setAddedByUses(final boolean addedByUses) { + this.addedByUses = addedByUses; + } + @Override public DataSchemaNodeBuilder getChildNode(String name) { DataSchemaNodeBuilder result = null; @@ -198,13 +243,18 @@ public final class GroupingBuilderImpl implements GroupingBuilder { return result; } + @Override + public Set getChildNodes() { + return childNodes; + } + @Override public void addChildNode(final DataSchemaNodeBuilder childNode) { addedChildNodes.add(childNode); } @Override - public Set getChildNodes() { + public Set getChildNodeBuilders() { return addedChildNodes; } @@ -213,7 +263,12 @@ public final class GroupingBuilderImpl implements GroupingBuilder { } @Override - public Set getGroupings() { + public Set getGroupings() { + return Collections.emptySet(); + } + + @Override + public Set getGroupingBuilders() { return addedGroupings; } @@ -254,13 +309,13 @@ public final class GroupingBuilderImpl implements GroupingBuilder { 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 +367,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 +482,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("]");