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=c4dab717b4dbe3cd47304a15d8f4a4c9f201e4d5;hb=5764d0f70d796fdd270c2dedcbedd38161238516;hp=47f39659c65d625defba748b2fd5c3649895169b;hpb=a670e0950a2036a0f9a420d1cb33414a61e4b1fb;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 47f39659c6..c4dab717b4 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,15 +7,15 @@ */ package org.opendaylight.yangtools.yang.parser.builder.impl; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; 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; import java.util.TreeSet; - import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.AugmentationSchema; import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; @@ -25,21 +25,26 @@ 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; -import org.opendaylight.yangtools.yang.parser.builder.api.AbstractSchemaNodeBuilder; 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.ConstraintsBuilder; import org.opendaylight.yangtools.yang.parser.builder.api.DataSchemaNodeBuilder; -import org.opendaylight.yangtools.yang.parser.util.Comparators; -import org.opendaylight.yangtools.yang.parser.util.ParserUtils; +import org.opendaylight.yangtools.yang.parser.builder.api.UnknownSchemaNodeBuilder; +import org.opendaylight.yangtools.yang.parser.builder.util.AbstractSchemaNodeBuilder; +import org.opendaylight.yangtools.yang.parser.builder.util.Comparators; import org.opendaylight.yangtools.yang.parser.util.YangParseException; public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements DataSchemaNodeBuilder, AugmentationTargetBuilder { - private boolean isBuilt; - private final ChoiceNodeImpl instance; + private ChoiceNodeImpl instance; + // DataSchemaNode args + private boolean augmenting; + private boolean addedByUses; + private boolean configuration; private final ConstraintsBuilder constraints; // AugmentationTarget args + private final Set augmentations = new HashSet<>(); private final List augmentationBuilders = new ArrayList<>(); // ChoiceNode args private final Set caseBuilders = new HashSet<>(); @@ -48,30 +53,27 @@ public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements Da public ChoiceBuilder(final String moduleName, final int line, final QName qname, final SchemaPath path) { super(moduleName, line, qname); this.schemaPath = path; - instance = new ChoiceNodeImpl(qname, path); - constraints = new ConstraintsBuilder(moduleName, line); + constraints = new ConstraintsBuilderImpl(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; - instance = new ChoiceNodeImpl(qname, path); - constraints = new ConstraintsBuilder(moduleName, line, base.getConstraints()); - - instance.description = base.getDescription(); - instance.reference = base.getReference(); - instance.status = base.getStatus(); - instance.augmenting = base.isAugmenting(); - instance.addedByUses = base.isAddedByUses(); - instance.configuration = base.isConfiguration(); - instance.constraints = base.getConstraints(); - instance.augmentations.addAll(base.getAvailableAugmentations()); + constraints = new ConstraintsBuilderImpl(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( + Set wrapped = BuilderUtils.wrapChildNodes(moduleName, line, new HashSet( base.getCases()), path, ns, rev, pref); for (DataSchemaNodeBuilder wrap : wrapped) { if (wrap instanceof ChoiceCaseBuilder) { @@ -79,38 +81,47 @@ public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements Da } } - instance.unknownNodes.addAll(base.getUnknownSchemaNodes()); + addedUnknownNodes.addAll(BuilderUtils.wrapUnknownNodes(moduleName, line, base.getUnknownSchemaNodes(), path, ns, + rev, pref)); } @Override public ChoiceNode build() { - if (!isBuilt) { - instance.setConstraints(constraints.build()); - instance.setDefaultCase(defaultCase); - - // CASES - final Set cases = new TreeSet<>(Comparators.SCHEMA_NODE_COMP); - for (ChoiceCaseBuilder caseBuilder : caseBuilders) { - cases.add(caseBuilder.build()); - } - instance.addCases(cases); + if (instance != null) { + return instance; + } - // AUGMENTATIONS - final Set augmentations = new HashSet<>(); - for (AugmentationSchemaBuilder builder : augmentationBuilders) { - augmentations.add(builder.build()); - } - instance.addAvailableAugmentations(augmentations); + instance = new ChoiceNodeImpl(qname, schemaPath); - // UNKNOWN NODES - for (UnknownSchemaNodeBuilder b : addedUnknownNodes) { - unknownNodes.add(b.build()); - } - Collections.sort(unknownNodes, Comparators.SCHEMA_NODE_COMP); - instance.addUnknownSchemaNodes(unknownNodes); + instance.description = description; + instance.reference = reference; + instance.status = status; + instance.augmenting = augmenting; + instance.addedByUses = addedByUses; + instance.configuration = configuration; + + instance.constraints = constraints.toInstance(); + instance.defaultCase = defaultCase; + + // CASES + final Set cases = new TreeSet<>(Comparators.SCHEMA_NODE_COMP); + for (ChoiceCaseBuilder caseBuilder : caseBuilders) { + cases.add(caseBuilder.build()); + } + instance.cases = ImmutableSet.copyOf(cases); + + // AUGMENTATIONS + for (AugmentationSchemaBuilder builder : augmentationBuilders) { + augmentations.add(builder.build()); + } + instance.augmentations = ImmutableSet.copyOf(augmentations); - isBuilt = true; + // UNKNOWN NODES + for (UnknownSchemaNodeBuilder b : addedUnknownNodes) { + unknownNodes.add(b.build()); } + instance.unknownNodes = ImmutableList.copyOf(unknownNodes); + return instance; } @@ -118,16 +129,6 @@ public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements Da return caseBuilders; } - @Override - public SchemaPath getPath() { - return instance.path; - } - - @Override - public void setPath(final SchemaPath path) { - instance.path = path; - } - /** * Get case by name. * @@ -157,11 +158,11 @@ public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements Da QName caseQName = caseNode.getQName(); String caseName = caseQName.getLocalName(); - for (ChoiceCaseBuilder addedCase : caseBuilders) { - if (addedCase.getQName().getLocalName().equals(caseName)) { + for (ChoiceCaseBuilder existingCase : caseBuilders) { + if (existingCase.getQName().getLocalName().equals(caseName)) { throw new YangParseException(caseNode.getModuleName(), caseNode.getLine(), "Can not add '" + caseNode - + "' to node '" + qname.getLocalName() + "' in module '" + moduleName - + "': case with same name already declared at line " + addedCase.getLine()); + + "' to node '" + qname.getLocalName() + "' in module '" + getModuleName() + + "': case with same name already declared at line " + existingCase.getLine()); } } @@ -176,73 +177,41 @@ public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements Da caseBuilder.setAugmenting(true); caseNode.setAugmenting(false); } - SchemaPath newPath = ParserUtils.createSchemaPath(caseNode.getPath(), caseQName); + SchemaPath newPath = caseNode.getPath().createChild(caseQName); caseNode.setPath(newPath); caseBuilder.addChildNode(caseNode); caseBuilders.add(caseBuilder); } } - @Override - public String getDescription() { - return instance.description; - } - - @Override - public void setDescription(final String description) { - instance.description = description; - } - - @Override - public String getReference() { - return instance.reference; - } - - @Override - public void setReference(final String reference) { - instance.reference = reference; - } - - @Override - public Status getStatus() { - return instance.status; - } - - @Override - public void setStatus(final Status status) { - if (status != null) { - instance.status = status; - } - } - @Override public boolean isAugmenting() { - return instance.augmenting; + return augmenting; } @Override public void setAugmenting(final boolean augmenting) { - instance.augmenting = augmenting; + this.augmenting = augmenting; } @Override public boolean isAddedByUses() { - return instance.addedByUses; + return addedByUses; } @Override public void setAddedByUses(final boolean addedByUses) { - instance.addedByUses = addedByUses; + this.addedByUses = addedByUses; } @Override public boolean isConfiguration() { - return instance.configuration; + return configuration; } @Override public void setConfiguration(final boolean configuration) { - instance.configuration = configuration; + this.configuration = configuration; } @Override @@ -294,11 +263,11 @@ public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements Da } else if (!schemaPath.equals(other.schemaPath)) { return false; } - if (parentBuilder == null) { - if (other.parentBuilder != null) { + if (getParent() == null) { + if (other.getParent() != null) { return false; } - } else if (!parentBuilder.equals(other.parentBuilder)) { + } else if (!getParent().equals(other.getParent())) { return false; } return true; @@ -311,17 +280,17 @@ public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements Da 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 final Set cases = new HashSet<>(); - private final Set augmentations = new HashSet<>(); - private final List unknownNodes = new ArrayList<>(); + private ImmutableSet cases; + private ImmutableSet augmentations; + private ImmutableList unknownNodes; private String defaultCase; private ChoiceNodeImpl(final QName qname, final SchemaPath path) { @@ -374,35 +343,19 @@ public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements Da return constraints; } - private void setConstraints(final ConstraintDefinition constraints) { - this.constraints = constraints; - } - @Override public Set getAvailableAugmentations() { - return Collections.unmodifiableSet(augmentations); - } - - private void addAvailableAugmentations(final Set availableAugmentations) { - if (availableAugmentations != null) { - this.augmentations.addAll(availableAugmentations); - } + return augmentations; } @Override public List getUnknownSchemaNodes() { - return Collections.unmodifiableList(unknownNodes); - } - - private void addUnknownSchemaNodes(final List unknownSchemaNodes) { - if (unknownSchemaNodes != null) { - this.unknownNodes.addAll(unknownSchemaNodes); - } + return unknownNodes; } @Override public Set getCases() { - return Collections.unmodifiableSet(cases); + return cases; } @Override @@ -432,21 +385,11 @@ public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements Da return null; } - private void addCases(final Set cases) { - if (cases != null) { - this.cases.addAll(cases); - } - } - @Override public String getDefaultCase() { return defaultCase; } - private void setDefaultCase(final String defaultCase) { - this.defaultCase = defaultCase; - } - @Override public int hashCode() { final int prime = 31; @@ -489,7 +432,7 @@ public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements Da public String toString() { StringBuilder sb = new StringBuilder(ChoiceNodeImpl.class.getSimpleName()); sb.append("["); - sb.append("qname=" + qname); + sb.append("qname=").append(qname); sb.append("]"); return sb.toString(); }