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%2FContainerSchemaNodeBuilder.java;h=c77444269c297c75acacc650254dc2cc26a1a707;hb=c7f01a26828345591366693478d2285cbf004c48;hp=94c6cb19a5e558f3876d1bb5c5e32d0e9893c6c5;hpb=8f3e67a41c334638c9c9b57559198a630b06ceaa;p=yangtools.git diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ContainerSchemaNodeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ContainerSchemaNodeBuilder.java index 94c6cb19a5..c77444269c 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ContainerSchemaNodeBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ContainerSchemaNodeBuilder.java @@ -7,153 +7,111 @@ */ 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; -import java.util.TreeSet; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.model.api.*; -import org.opendaylight.yangtools.yang.parser.builder.api.AbstractDataNodeContainerBuilder; +import org.opendaylight.yangtools.yang.model.api.AugmentationSchema; +import org.opendaylight.yangtools.yang.model.api.ConstraintDefinition; +import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; +import org.opendaylight.yangtools.yang.model.api.DerivableSchemaNode; +import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; 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.builder.api.GroupingBuilder; -import org.opendaylight.yangtools.yang.parser.builder.api.TypeDefinitionBuilder; -import org.opendaylight.yangtools.yang.parser.builder.api.UsesNodeBuilder; -import org.opendaylight.yangtools.yang.parser.util.Comparators; -import org.opendaylight.yangtools.yang.parser.util.ParserUtils; -import org.opendaylight.yangtools.yang.parser.util.YangParseException; - -public final class ContainerSchemaNodeBuilder extends AbstractDataNodeContainerBuilder implements - AugmentationTargetBuilder, DataSchemaNodeBuilder { - private boolean isBuilt; - private final ContainerSchemaNodeImpl instance; - private YangNode parent; +import org.opendaylight.yangtools.yang.parser.builder.api.SchemaNodeBuilder; +import org.opendaylight.yangtools.yang.parser.builder.api.UnknownSchemaNodeBuilder; +import org.opendaylight.yangtools.yang.parser.builder.util.AbstractDocumentedDataNodeContainer; +import org.opendaylight.yangtools.yang.parser.builder.util.AbstractDocumentedDataNodeContainerBuilder; + +import com.google.common.base.Optional; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; - private final SchemaPath path; +public final class ContainerSchemaNodeBuilder extends AbstractDocumentedDataNodeContainerBuilder implements + AugmentationTargetBuilder, DataSchemaNodeBuilder { + private ContainerSchemaNodeImpl instance; + private boolean presence; + // SchemaNode args + private SchemaPath path; // DataSchemaNode args - private Boolean configuration; + private boolean augmenting; + private boolean addedByUses; + private boolean configuration; + private ContainerSchemaNode originalNode; + private ContainerSchemaNodeBuilder originalBuilder; private final ConstraintsBuilder constraints; // AugmentationTarget args + private final List augmentations = new ArrayList<>(); private final List augmentationBuilders = new ArrayList<>(); public ContainerSchemaNodeBuilder(final String moduleName, final int line, final QName qname, final SchemaPath path) { super(moduleName, line, qname); - this.path = path; - this.instance = new ContainerSchemaNodeImpl(qname, path); - this.constraints = new ConstraintsBuilder(moduleName, line); + this.path = Preconditions.checkNotNull(path, "Schema Path must not be null"); + this.constraints = new ConstraintsBuilderImpl(moduleName, line); } // constructor for uses public ContainerSchemaNodeBuilder(final String moduleName, final int line, final QName qname, final SchemaPath path, final ContainerSchemaNode base) { - super(moduleName, line, qname); - this.path = path; - instance = new ContainerSchemaNodeImpl(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()); - - URI ns = qname.getNamespace(); - Date rev = qname.getRevision(); - String pref = qname.getPrefix(); - addedChildNodes.addAll(ParserUtils.wrapChildNodes(moduleName, line, base.getChildNodes(), path, ns, rev, pref)); - addedGroupings.addAll(ParserUtils.wrapGroupings(moduleName, line, base.getGroupings(), path, ns, rev, pref)); - addedTypedefs.addAll(ParserUtils.wrapTypedefs(moduleName, line, base, path, ns, rev, pref)); - addedUnknownNodes.addAll(ParserUtils.wrapUnknownNodes(moduleName, line, base.getUnknownSchemaNodes(), path, ns, - rev, pref)); - - instance.uses.addAll(base.getUses()); - instance.presence = base.isPresenceContainer(); - instance.configuration = base.isConfiguration(); - this.configuration = base.isConfiguration(); - } + super(moduleName, line, qname, path, base); + this.path = Preconditions.checkNotNull(path, "Schema Path must not be null"); - @Override - public ContainerSchemaNode build() { - if (!isBuilt) { + constraints = new ConstraintsBuilderImpl(moduleName, line, base.getConstraints()); - // if this builder represents rpc input or output, it can has - // configuration value set to null - if (configuration == null) { - configuration = false; - } - instance.setConfiguration(configuration); + augmenting = base.isAugmenting(); + addedByUses = base.isAddedByUses(); + originalNode = base; + configuration = base.isConfiguration(); + presence = base.isPresenceContainer(); - // USES - for (UsesNodeBuilder builder : addedUsesNodes) { - usesNodes.add(builder.build()); - } - instance.addUses(usesNodes); + augmentations.addAll(base.getAvailableAugmentations()); - // CHILD NODES - for (DataSchemaNodeBuilder node : addedChildNodes) { - childNodes.add(node.build()); - } - instance.addChildNodes(childNodes); - - // GROUPINGS - for (GroupingBuilder builder : addedGroupings) { - groupings.add(builder.build()); - } - instance.addGroupings(groupings); + } - // TYPEDEFS - for (TypeDefinitionBuilder entry : addedTypedefs) { - typedefs.add(entry.build()); - } - instance.addTypeDefinitions(typedefs); + @Override + protected String getStatementName() { + return "container"; + } - // AUGMENTATIONS - final List augmentations = new ArrayList<>(); - for (AugmentationSchemaBuilder builder : augmentationBuilders) { - augmentations.add(builder.build()); - } - instance.addAvailableAugmentations(new HashSet<>(augmentations)); + @Override + public ContainerSchemaNode build() { + if (instance != null) { + return instance; + } - // UNKNOWN NODES - for (UnknownSchemaNodeBuilder b : addedUnknownNodes) { - unknownNodes.add(b.build()); - } - Collections.sort(unknownNodes, Comparators.SCHEMA_NODE_COMP); - instance.addUnknownSchemaNodes(unknownNodes); + buildChildren(); + instance = new ContainerSchemaNodeImpl(this); - if (constraints != null) { - instance.setConstraints(constraints.build()); - } + instance.augmenting = augmenting; + instance.addedByUses = addedByUses; + instance.configuration = configuration; + instance.constraints = constraints.toInstance(); + instance.presence = presence; - isBuilt = true; + // ORIGINAL NODE + if (originalNode == null && originalBuilder != null) { + originalNode = originalBuilder.build(); } - return instance; - } + instance.original = originalNode; - @Override - public Set getTypeDefinitionBuilders() { - return addedTypedefs; - } + // AUGMENTATIONS + for (AugmentationSchemaBuilder builder : augmentationBuilders) { + augmentations.add(builder.build()); + } + instance.augmentations = ImmutableSet.copyOf(augmentations); - @Override - public void addTypedef(final TypeDefinitionBuilder type) { - String typeName = type.getQName().getLocalName(); - for (TypeDefinitionBuilder addedTypedef : addedTypedefs) { - if (addedTypedef.getQName().getLocalName().equals(typeName)) { - throw new YangParseException(moduleName, type.getLine(), "Can not add typedef '" + typeName - + "': typedef with same name already declared at line " + addedTypedef.getLine()); - } + // UNKNOWN NODES + for (UnknownSchemaNodeBuilder b : addedUnknownNodes) { + unknownNodes.add(b.build()); } - addedTypedefs.add(type); + instance.unknownNodes = ImmutableList.copyOf(unknownNodes); + + return instance; } public List getAugmentationBuilders() { @@ -161,80 +119,60 @@ public final class ContainerSchemaNodeBuilder extends AbstractDataNodeContainerB } @Override - public void addAugmentation(AugmentationSchemaBuilder augment) { + public void addAugmentation(final AugmentationSchemaBuilder augment) { augmentationBuilders.add(augment); } @Override public SchemaPath getPath() { - return instance.path; + return path; } @Override - public void setPath(SchemaPath path) { - instance.path = path; - } - - @Override - public String getDescription() { - return instance.description; - } - - @Override - public void setDescription(final String description) { - instance.description = description; - } - - @Override - public String getReference() { - return instance.reference; + public void setPath(final SchemaPath path) { + this.path = path; } @Override - public void setReference(final String reference) { - instance.reference = reference; + public boolean isAugmenting() { + return augmenting; } @Override - public Status getStatus() { - return instance.status; + public void setAugmenting(final boolean augmenting) { + this.augmenting = augmenting; } @Override - public void setStatus(Status status) { - if (status != null) { - instance.status = status; - } + public boolean isAddedByUses() { + return addedByUses; } @Override - public boolean isAugmenting() { - return instance.augmenting; + public void setAddedByUses(final boolean addedByUses) { + this.addedByUses = addedByUses; } @Override - public void setAugmenting(boolean augmenting) { - instance.augmenting = augmenting; + public ContainerSchemaNodeBuilder getOriginal() { + return originalBuilder; } @Override - public boolean isAddedByUses() { - return instance.addedByUses; + public void setOriginal(final SchemaNodeBuilder builder) { + Preconditions.checkArgument(builder instanceof ContainerSchemaNodeBuilder, "Original of container cannot be " + + builder); + this.originalBuilder = (ContainerSchemaNodeBuilder) builder; } @Override - public void setAddedByUses(final boolean addedByUses) { - instance.addedByUses = addedByUses; + public boolean isConfiguration() { + return configuration; } @Override - public Boolean isConfiguration() { - return instance.configuration; - } - - @Override - public void setConfiguration(Boolean configuration) { - instance.configuration = configuration; + public void setConfiguration(final boolean configuration) { + this.configuration = configuration; } @Override @@ -243,11 +181,11 @@ public final class ContainerSchemaNodeBuilder extends AbstractDataNodeContainerB } public boolean isPresence() { - return instance.presence; + return presence; } - public void setPresence(boolean presence) { - instance.presence = presence; + public void setPresence(final boolean presence) { + this.presence = presence; } @Override @@ -259,7 +197,7 @@ public final class ContainerSchemaNodeBuilder extends AbstractDataNodeContainerB } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } @@ -277,11 +215,11 @@ public final class ContainerSchemaNodeBuilder extends AbstractDataNodeContainerB } else if (!path.equals(other.path)) { return false; } - if (parent == null) { - if (other.parent != null) { + if (getParent() == null) { + if (other.getParent() != null) { return false; } - } else if (!parent.equals(other.parent)) { + } else if (!getParent().equals(other.getParent())) { return false; } return true; @@ -292,27 +230,26 @@ public final class ContainerSchemaNodeBuilder extends AbstractDataNodeContainerB return "container " + qname.getLocalName(); } - public final class ContainerSchemaNodeImpl implements ContainerSchemaNode { + private static final class ContainerSchemaNodeImpl extends AbstractDocumentedDataNodeContainer implements + ContainerSchemaNode, DerivableSchemaNode { private final QName qname; - private SchemaPath path; - private String description; - private String reference; - private Status status = Status.CURRENT; + private final SchemaPath path; + private boolean augmenting; private boolean addedByUses; private boolean configuration; + private ContainerSchemaNode original; private ConstraintDefinition constraints; - private final Set augmentations = new HashSet<>(); - private final Set childNodes = new TreeSet<>(Comparators.SCHEMA_NODE_COMP); - private final Set groupings = new TreeSet<>(Comparators.SCHEMA_NODE_COMP); - private final Set> typeDefinitions = new TreeSet<>(Comparators.SCHEMA_NODE_COMP); - private final Set uses = new HashSet<>(); - private final List unknownNodes = new ArrayList<>(); + + private ImmutableSet augmentations; + private ImmutableList unknownNodes; + private boolean presence; - private ContainerSchemaNodeImpl(QName qname, SchemaPath path) { - this.qname = qname; - this.path = path; + public ContainerSchemaNodeImpl(final ContainerSchemaNodeBuilder builder) { + super(builder); + this.qname = builder.getQName(); + this.path = builder.getPath(); } @Override @@ -325,21 +262,6 @@ public final class ContainerSchemaNodeBuilder extends AbstractDataNodeContainerB return path; } - @Override - public String getDescription() { - return description; - } - - @Override - public String getReference() { - return reference; - } - - @Override - public Status getStatus() { - return status; - } - @Override public boolean isAugmenting() { return augmenting; @@ -351,12 +273,13 @@ public final class ContainerSchemaNodeBuilder extends AbstractDataNodeContainerB } @Override - public boolean isConfiguration() { - return configuration; + public Optional getOriginal() { + return Optional.fromNullable(original); } - private void setConfiguration(boolean configuration) { - this.configuration = configuration; + @Override + public boolean isConfiguration() { + return configuration; } @Override @@ -364,62 +287,9 @@ public final class ContainerSchemaNodeBuilder extends AbstractDataNodeContainerB return constraints; } - private void setConstraints(ConstraintDefinition constraints) { - this.constraints = constraints; - } - @Override public Set getAvailableAugmentations() { - return Collections.unmodifiableSet(augmentations); - } - - private void addAvailableAugmentations(Set augmentations) { - if (augmentations != null) { - this.augmentations.addAll(augmentations); - } - } - - @Override - public Set getChildNodes() { - return Collections.unmodifiableSet(childNodes); - } - - private void addChildNodes(Set childNodes) { - if (childNodes != null) { - this.childNodes.addAll(childNodes); - } - } - - @Override - public Set getGroupings() { - return Collections.unmodifiableSet(groupings); - } - - private void addGroupings(Set groupings) { - if (groupings != null) { - this.groupings.addAll(groupings); - } - } - - @Override - public DataSchemaNode getDataChildByName(QName name) { - return getChildNode(childNodes, name); - } - - @Override - public DataSchemaNode getDataChildByName(String name) { - return getChildNode(childNodes, name); - } - - @Override - public Set getUses() { - return Collections.unmodifiableSet(uses); - } - - private void addUses(Set uses) { - if (uses != null) { - this.uses.addAll(uses); - } + return augmentations; } @Override @@ -427,26 +297,9 @@ public final class ContainerSchemaNodeBuilder extends AbstractDataNodeContainerB return presence; } - @Override - public Set> getTypeDefinitions() { - return Collections.unmodifiableSet(typeDefinitions); - } - - private void addTypeDefinitions(Set> typeDefinitions) { - if (typeDefinitions != null) { - this.typeDefinitions.addAll(typeDefinitions); - } - } - @Override public List getUnknownSchemaNodes() { - return Collections.unmodifiableList(unknownNodes); - } - - private void addUnknownSchemaNodes(List unknownSchemaNodes) { - if (unknownSchemaNodes != null) { - this.unknownNodes.addAll(unknownSchemaNodes); - } + return unknownNodes; } @Override @@ -459,7 +312,7 @@ public final class ContainerSchemaNodeBuilder extends AbstractDataNodeContainerB } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } @@ -491,6 +344,7 @@ public final class ContainerSchemaNodeBuilder extends AbstractDataNodeContainerB public String toString() { return "container " + qname.getLocalName(); } + } }