X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-parser-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fparser%2Fbuilder%2Fimpl%2FChoiceBuilder.java;h=1fdd524d919e108ef470a108e81a5e118c06246a;hb=d50b1bfe8ba708d57fe6428cdd39d87853a4e779;hp=05095fe93680b6031f735ec5461e4c9dbf8628ad;hpb=d2faa2a51d1945ebbb92a5dbfdb500b5820bf014;p=yangtools.git diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceBuilder.java index 05095fe936..1fdd524d91 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceBuilder.java @@ -7,8 +7,9 @@ */ package org.opendaylight.yangtools.yang.parser.builder.impl; +import java.net.URI; import java.util.ArrayList; -import java.util.Collections; +import java.util.Date; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -19,6 +20,7 @@ import org.opendaylight.yangtools.yang.model.api.AugmentationSchema; import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; import org.opendaylight.yangtools.yang.model.api.ChoiceNode; import org.opendaylight.yangtools.yang.model.api.ConstraintDefinition; +import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; @@ -26,96 +28,117 @@ import org.opendaylight.yangtools.yang.parser.builder.api.AbstractSchemaNodeBuil import org.opendaylight.yangtools.yang.parser.builder.api.AugmentationSchemaBuilder; import org.opendaylight.yangtools.yang.parser.builder.api.AugmentationTargetBuilder; import org.opendaylight.yangtools.yang.parser.builder.api.DataSchemaNodeBuilder; -import org.opendaylight.yangtools.yang.parser.builder.api.GroupingMember; import org.opendaylight.yangtools.yang.parser.util.Comparators; import org.opendaylight.yangtools.yang.parser.util.ParserUtils; import org.opendaylight.yangtools.yang.parser.util.YangParseException; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; + public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements DataSchemaNodeBuilder, - AugmentationTargetBuilder, GroupingMember { - private boolean isBuilt; - private final ChoiceNodeImpl instance; + AugmentationTargetBuilder { + private ChoiceNodeImpl instance; + // DataSchemaNode args private boolean augmenting; private boolean addedByUses; - private Boolean configuration; + private boolean configuration; private final ConstraintsBuilder constraints; // AugmentationTarget args - private final Set addedAugmentations = new HashSet(); + private final Set augmentations = new HashSet<>(); + private final List augmentationBuilders = new ArrayList<>(); // ChoiceNode args - private Set cases; - private final Set addedCases = new HashSet(); + private final Set caseBuilders = new HashSet<>(); private String defaultCase; - public ChoiceBuilder(final String moduleName, final int line, final QName qname) { + public ChoiceBuilder(final String moduleName, final int line, final QName qname, final SchemaPath path) { super(moduleName, line, qname); - instance = new ChoiceNodeImpl(qname); + this.schemaPath = path; constraints = new ConstraintsBuilder(moduleName, line); } + public ChoiceBuilder(final String moduleName, final int line, final QName qname, final SchemaPath path, + final ChoiceNode base) { + super(moduleName, line, qname); + this.schemaPath = path; + constraints = new ConstraintsBuilder(moduleName, line, base.getConstraints()); + + description = base.getDescription(); + reference = base.getReference(); + status = base.getStatus(); + augmenting = base.isAugmenting(); + addedByUses = base.isAddedByUses(); + configuration = base.isConfiguration(); + augmentations.addAll(base.getAvailableAugmentations()); + + URI ns = qname.getNamespace(); + Date rev = qname.getRevision(); + String pref = qname.getPrefix(); + Set wrapped = ParserUtils.wrapChildNodes(moduleName, line, new HashSet( + base.getCases()), path, ns, rev, pref); + for (DataSchemaNodeBuilder wrap : wrapped) { + if (wrap instanceof ChoiceCaseBuilder) { + caseBuilders.add((ChoiceCaseBuilder) wrap); + } + } + + addedUnknownNodes.addAll(ParserUtils.wrapUnknownNodes(moduleName, line, base.getUnknownSchemaNodes(), path, ns, + rev, pref)); + } + @Override public ChoiceNode build() { - if (!isBuilt) { - instance.setPath(schemaPath); - instance.setDescription(description); - instance.setReference(reference); - instance.setStatus(status); - instance.setAugmenting(augmenting); - instance.setAddedByUses(addedByUses); - instance.setConfiguration(configuration); - instance.setConstraints(constraints.build()); - instance.setDefaultCase(defaultCase); - - // CASES - if (cases == null) { - cases = new TreeSet(Comparators.SCHEMA_NODE_COMP); - for (ChoiceCaseBuilder caseBuilder : addedCases) { - cases.add(caseBuilder.build()); - } - } - instance.setCases(cases); + if (instance != null) { + return instance; + } - // AUGMENTATIONS - final Set augmentations = new HashSet(); - for (AugmentationSchemaBuilder builder : addedAugmentations) { - augmentations.add(builder.build()); - } - instance.setAvailableAugmentations(augmentations); + instance = new ChoiceNodeImpl(qname, schemaPath); - // 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); + instance.description = description; + instance.reference = reference; + instance.status = status; + instance.augmenting = augmenting; + instance.addedByUses = addedByUses; + instance.configuration = configuration; - isBuilt = true; + instance.constraints = constraints.build(); + instance.defaultCase = defaultCase; + + // CASES + final Set cases = new TreeSet<>(Comparators.SCHEMA_NODE_COMP); + for (ChoiceCaseBuilder caseBuilder : caseBuilders) { + cases.add(caseBuilder.build()); } - return instance; - } + instance.cases = ImmutableSet.copyOf(cases); - @Override - public void rebuild() { - isBuilt = false; - build(); + // AUGMENTATIONS + for (AugmentationSchemaBuilder builder : augmentationBuilders) { + augmentations.add(builder.build()); + } + instance.augmentations = ImmutableSet.copyOf(augmentations); + + // UNKNOWN NODES + for (UnknownSchemaNodeBuilder b : addedUnknownNodes) { + unknownNodes.add(b.build()); + } + instance.unknownNodes = ImmutableList.copyOf(unknownNodes); + + return instance; } public Set getCases() { - return addedCases; + return caseBuilders; } /** * Get case by name. - * + * * @param caseName * name of case to search * @return case with given name if present, null otherwise */ - public ChoiceCaseBuilder getCaseNodeByName(String caseName) { - for (ChoiceCaseBuilder addedCase : addedCases) { + public ChoiceCaseBuilder getCaseNodeByName(final String caseName) { + for (ChoiceCaseBuilder addedCase : caseBuilders) { if (addedCase.getQName().getLocalName().equals(caseName)) { return addedCase; } @@ -125,17 +148,18 @@ public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements Da /** * Add case node to this choice. - * + * * If node is not declared with 'case' keyword, create new case builder and * make this node child of newly created case. - * + * * @param caseNode * case node */ - public void addCase(DataSchemaNodeBuilder caseNode) { + public void addCase(final DataSchemaNodeBuilder caseNode) { QName caseQName = caseNode.getQName(); String caseName = caseQName.getLocalName(); - for (ChoiceCaseBuilder addedCase : addedCases) { + + for (ChoiceCaseBuilder addedCase : caseBuilders) { if (addedCase.getQName().getLocalName().equals(caseName)) { throw new YangParseException(caseNode.getModuleName(), caseNode.getLine(), "Can not add '" + caseNode + "' to node '" + qname.getLocalName() + "' in module '" + moduleName @@ -144,35 +168,30 @@ public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements Da } if (caseNode instanceof ChoiceCaseBuilder) { - addedCases.add((ChoiceCaseBuilder) caseNode); + caseBuilders.add((ChoiceCaseBuilder) caseNode); } else { ChoiceCaseBuilder caseBuilder = new ChoiceCaseBuilder(caseNode.getModuleName(), caseNode.getLine(), - caseQName); + caseQName, caseNode.getPath()); if (caseNode.isAugmenting()) { // if node is added by augmentation, set case builder augmenting // as true and node augmenting as false caseBuilder.setAugmenting(true); caseNode.setAugmenting(false); } - caseBuilder.setPath(caseNode.getPath()); - SchemaPath newPath = ParserUtils.createSchemaPath(caseNode.getPath(), caseQName); + SchemaPath newPath = caseNode.getPath().createChild(caseQName); caseNode.setPath(newPath); caseBuilder.addChildNode(caseNode); - addedCases.add(caseBuilder); + caseBuilders.add(caseBuilder); } } - public void setCases(Set cases) { - this.cases = cases; - } - @Override public boolean isAugmenting() { return augmenting; } @Override - public void setAugmenting(boolean augmenting) { + public void setAugmenting(final boolean augmenting) { this.augmenting = augmenting; } @@ -186,12 +205,13 @@ public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements Da this.addedByUses = addedByUses; } - public Boolean isConfiguration() { + @Override + public boolean isConfiguration() { return configuration; } @Override - public void setConfiguration(Boolean configuration) { + public void setConfiguration(final boolean configuration) { this.configuration = configuration; } @@ -200,24 +220,20 @@ public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements Da return constraints; } - public Set getAugmentations() { - return addedAugmentations; - } - @Override - public void addAugmentation(AugmentationSchemaBuilder augment) { - addedAugmentations.add(augment); + public void addAugmentation(final AugmentationSchemaBuilder augment) { + augmentationBuilders.add(augment); } - public List getUnknownNodes() { - return addedUnknownNodes; + public List getAugmentationBuilders() { + return augmentationBuilders; } public String getDefaultCase() { return defaultCase; } - public void setDefaultCase(String defaultCase) { + public void setDefaultCase(final String defaultCase) { this.defaultCase = defaultCase; } @@ -230,7 +246,7 @@ public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements Da } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } @@ -248,11 +264,11 @@ public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements Da } else if (!schemaPath.equals(other.schemaPath)) { return false; } - if (parent == null) { - if (other.parent != null) { + if (parentBuilder == null) { + if (other.parentBuilder != null) { return false; } - } else if (!parent.equals(other.parent)) { + } else if (!parentBuilder.equals(other.parentBuilder)) { return false; } return true; @@ -263,23 +279,24 @@ public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements Da return "choice " + qname.getLocalName(); } - public final class ChoiceNodeImpl implements ChoiceNode { + private static final class ChoiceNodeImpl implements ChoiceNode { private final QName qname; - private SchemaPath path; + private final SchemaPath path; private String description; private String reference; - private Status status = Status.CURRENT; + private Status status; private boolean augmenting; private boolean addedByUses; private boolean configuration; private ConstraintDefinition constraints; - private Set cases = Collections.emptySet(); - private Set augmentations = Collections.emptySet(); - private List unknownNodes = Collections.emptyList(); + private ImmutableSet cases; + private ImmutableSet augmentations; + private ImmutableList unknownNodes; private String defaultCase; - private ChoiceNodeImpl(QName qname) { + private ChoiceNodeImpl(final QName qname, final SchemaPath path) { this.qname = qname; + this.path = path; } @Override @@ -292,97 +309,51 @@ public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements Da return path; } - private void setPath(SchemaPath path) { - this.path = path; - } - @Override public String getDescription() { return description; } - private void setDescription(String description) { - this.description = description; - } - @Override public String getReference() { return reference; } - private void setReference(String reference) { - this.reference = reference; - } - @Override public Status getStatus() { return status; } - private void setStatus(Status status) { - if (status != null) { - this.status = status; - } - } - @Override public boolean isAugmenting() { return augmenting; } - private void setAugmenting(boolean augmenting) { - this.augmenting = augmenting; - } - @Override public boolean isAddedByUses() { return addedByUses; } - private void setAddedByUses(boolean addedByUses) { - this.addedByUses = addedByUses; - } - @Override public boolean isConfiguration() { return configuration; } - private void setConfiguration(boolean configuration) { - this.configuration = configuration; - } - @Override public ConstraintDefinition getConstraints() { return constraints; } - private void setConstraints(ConstraintDefinition constraints) { - this.constraints = constraints; - } - @Override public Set getAvailableAugmentations() { return augmentations; } - private void setAvailableAugmentations(Set availableAugmentations) { - if (availableAugmentations != null) { - this.augmentations = availableAugmentations; - } - } - @Override public List getUnknownSchemaNodes() { return unknownNodes; } - private void setUnknownSchemaNodes(List unknownSchemaNodes) { - if (unknownSchemaNodes != null) { - this.unknownNodes = unknownSchemaNodes; - } - } - @Override public Set getCases() { return cases; @@ -394,10 +365,8 @@ public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements Da throw new IllegalArgumentException("Choice Case QName cannot be NULL!"); } for (final ChoiceCaseNode caseNode : cases) { - if (caseNode != null) { - if (name.equals(caseNode.getQName())) { - return caseNode; - } + if (caseNode != null && name.equals(caseNode.getQName())) { + return caseNode; } } return null; @@ -409,34 +378,19 @@ public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements Da throw new IllegalArgumentException("Choice Case string Name cannot be NULL!"); } for (final ChoiceCaseNode caseNode : cases) { - if (caseNode != null && (caseNode.getQName() != null)) { - if (name.equals(caseNode.getQName().getLocalName())) { - return caseNode; - } + if (caseNode != null && (caseNode.getQName() != null) + && name.equals(caseNode.getQName().getLocalName())) { + return caseNode; } } return null; } - private void setCases(Set cases) { - if (cases != null) { - this.cases = cases; - } - } - @Override public String getDefaultCase() { return defaultCase; } - private void setDefaultCase(String defaultCase) { - this.defaultCase = defaultCase; - } - - public ChoiceBuilder toBuilder() { - return ChoiceBuilder.this; - } - @Override public int hashCode() { final int prime = 31; @@ -447,7 +401,7 @@ public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements Da } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; }