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=421d35ff72878880c0fbf590e53fc69bae61fc95;hb=42abb28b99a02f9580f4676ce5c315628e5bcd24;hp=516837151081a16ef985bcdcc1571f754689431c;hpb=0d123fd7b44c8f857f5b396587c9ca13851213af;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 5168371510..421d35ff72 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,50 +7,40 @@ */ package org.opendaylight.yangtools.yang.parser.builder.impl; -import java.net.URI; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; import java.util.ArrayList; -import java.util.Date; import java.util.List; -import java.util.Set; - +import java.util.Objects; import org.opendaylight.yangtools.yang.common.QName; 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.DataSchemaNode; -import org.opendaylight.yangtools.yang.model.api.GroupingDefinition; import org.opendaylight.yangtools.yang.model.api.SchemaPath; -import org.opendaylight.yangtools.yang.model.api.Status; -import org.opendaylight.yangtools.yang.model.api.TypeDefinition; -import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; -import org.opendaylight.yangtools.yang.model.api.UsesNode; -import org.opendaylight.yangtools.yang.parser.builder.api.AbstractDataNodeContainerBuilder; 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.ParserUtils; -import org.opendaylight.yangtools.yang.parser.util.YangParseException; - -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; +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.AbstractDocumentedDataNodeContainerBuilder; -public final class ContainerSchemaNodeBuilder extends AbstractDataNodeContainerBuilder implements +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated +public final class ContainerSchemaNodeBuilder extends AbstractDocumentedDataNodeContainerBuilder implements AugmentationTargetBuilder, DataSchemaNodeBuilder { private ContainerSchemaNodeImpl instance; private boolean presence; // SchemaNode args private SchemaPath path; - private String description; - private String reference; - private Status status = Status.CURRENT; // DataSchemaNode args 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<>(); @@ -58,36 +48,31 @@ public final class ContainerSchemaNodeBuilder extends AbstractDataNodeContainerB public ContainerSchemaNodeBuilder(final String moduleName, final int line, final QName qname, final SchemaPath path) { super(moduleName, line, qname); - this.path = 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; - constraints = new ConstraintsBuilder(moduleName, line, base.getConstraints()); + super(moduleName, line, qname, path, base); + this.path = Preconditions.checkNotNull(path, "Schema Path must not be null"); + + constraints = new ConstraintsBuilderImpl(moduleName, line, base.getConstraints()); - description = base.getDescription(); - reference = base.getReference(); - status = base.getStatus(); augmenting = base.isAugmenting(); addedByUses = base.isAddedByUses(); + originalNode = base; configuration = base.isConfiguration(); presence = base.isPresenceContainer(); - 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)); - augmentations.addAll(base.getAvailableAugmentations()); - usesNodes.addAll(base.getUses()); + + } + + @Override + protected String getStatementName() { + return "container"; } @Override @@ -96,40 +81,20 @@ public final class ContainerSchemaNodeBuilder extends AbstractDataNodeContainerB return instance; } - instance = new ContainerSchemaNodeImpl(qname, path); + buildChildren(); + instance = new ContainerSchemaNodeImpl(this); - instance.description = description; - instance.reference = reference; - instance.status = status; instance.augmenting = augmenting; instance.addedByUses = addedByUses; instance.configuration = configuration; instance.constraints = constraints.build(); instance.presence = presence; - // CHILD NODES - for (DataSchemaNodeBuilder node : addedChildNodes) { - childNodes.put(node.getQName(), node.build()); - } - instance.childNodes = ImmutableSet.copyOf(childNodes.values()); - - // GROUPINGS - for (GroupingBuilder builder : addedGroupings) { - groupings.add(builder.build()); - } - instance.groupings = ImmutableSet.copyOf(groupings); - - // TYPEDEFS - for (TypeDefinitionBuilder entry : addedTypedefs) { - typedefs.add(entry.build()); - } - instance.typeDefinitions = ImmutableSet.copyOf(typedefs); - - // USES - for (UsesNodeBuilder builder : addedUsesNodes) { - usesNodes.add(builder.build()); + // ORIGINAL NODE + if (originalNode == null && originalBuilder != null) { + originalNode = originalBuilder.build(); } - instance.uses = ImmutableSet.copyOf(usesNodes); + instance.original = originalNode; // AUGMENTATIONS for (AugmentationSchemaBuilder builder : augmentationBuilders) { @@ -146,23 +111,6 @@ public final class ContainerSchemaNodeBuilder extends AbstractDataNodeContainerB return instance; } - @Override - public Set getTypeDefinitionBuilders() { - return addedTypedefs; - } - - @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(getModuleName(), type.getLine(), "Can not add typedef '" + typeName - + "': typedef with same name already declared at line " + addedTypedef.getLine()); - } - } - addedTypedefs.add(type); - } - public List getAugmentationBuilders() { return augmentationBuilders; } @@ -182,36 +130,6 @@ public final class ContainerSchemaNodeBuilder extends AbstractDataNodeContainerB this.path = path; } - @Override - public String getDescription() { - return description; - } - - @Override - public void setDescription(final String description) { - this.description = description; - } - - @Override - public String getReference() { - return reference; - } - - @Override - public void setReference(final String reference) { - this.reference = reference; - } - - @Override - public Status getStatus() { - return status; - } - - @Override - public void setStatus(final Status status) { - this.status = Preconditions.checkNotNull(status, "status cannot be null"); - } - @Override public boolean isAugmenting() { return augmenting; @@ -232,6 +150,18 @@ public final class ContainerSchemaNodeBuilder extends AbstractDataNodeContainerB this.addedByUses = addedByUses; } + @Override + public ContainerSchemaNodeBuilder getOriginal() { + return originalBuilder; + } + + @Override + public void setOriginal(final SchemaNodeBuilder builder) { + Preconditions.checkArgument(builder instanceof ContainerSchemaNodeBuilder, "Original of container cannot be " + + builder); + this.originalBuilder = (ContainerSchemaNodeBuilder) builder; + } + @Override public boolean isConfiguration() { return configuration; @@ -259,7 +189,7 @@ public final class ContainerSchemaNodeBuilder extends AbstractDataNodeContainerB public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((path == null) ? 0 : path.hashCode()); + result = prime * result + Objects.hashCode(path); return result; } @@ -282,8 +212,6 @@ public final class ContainerSchemaNodeBuilder extends AbstractDataNodeContainerB } else if (!path.equals(other.path)) { return false; } - // FIXME: Do we really need this? This actually triggers equals - // up to the root builder. if (getParent() == null) { if (other.getParent() != null) { return false; @@ -299,163 +227,4 @@ public final class ContainerSchemaNodeBuilder extends AbstractDataNodeContainerB return "container " + qname.getLocalName(); } - private static final class ContainerSchemaNodeImpl implements ContainerSchemaNode { - private final QName qname; - private final SchemaPath path; - private String description; - private String reference; - private Status status; - private boolean augmenting; - private boolean addedByUses; - private boolean configuration; - private ConstraintDefinition constraints; - - private ImmutableSet augmentations; - private ImmutableSet childNodes; - private ImmutableSet groupings; - private ImmutableSet> typeDefinitions; - private ImmutableSet uses; - private ImmutableList unknownNodes; - - private boolean presence; - - private ContainerSchemaNodeImpl(final QName qname, final SchemaPath path) { - this.qname = qname; - this.path = path; - } - - @Override - public QName getQName() { - return qname; - } - - @Override - public SchemaPath getPath() { - 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; - } - - @Override - public boolean isAddedByUses() { - return addedByUses; - } - - @Override - public boolean isConfiguration() { - return configuration; - } - - @Override - public ConstraintDefinition getConstraints() { - return constraints; - } - - @Override - public Set getAvailableAugmentations() { - return augmentations; - } - - @Override - public Set getChildNodes() { - return childNodes; - } - - @Override - public Set getGroupings() { - return groupings; - } - - @Override - public DataSchemaNode getDataChildByName(final QName name) { - return getChildNode(childNodes, name); - } - - @Override - public DataSchemaNode getDataChildByName(final String name) { - return getChildNode(childNodes, name); - } - - @Override - public Set getUses() { - return uses; - } - - @Override - public boolean isPresenceContainer() { - return presence; - } - - @Override - public Set> getTypeDefinitions() { - return typeDefinitions; - } - - @Override - public List getUnknownSchemaNodes() { - return unknownNodes; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((qname == null) ? 0 : qname.hashCode()); - result = prime * result + ((path == null) ? 0 : path.hashCode()); - return result; - } - - @Override - public boolean equals(final Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - ContainerSchemaNodeImpl other = (ContainerSchemaNodeImpl) obj; - if (qname == null) { - if (other.qname != null) { - return false; - } - } else if (!qname.equals(other.qname)) { - return false; - } - if (path == null) { - if (other.path != null) { - return false; - } - } else if (!path.equals(other.path)) { - return false; - } - return true; - } - - @Override - public String toString() { - return "container " + qname.getLocalName(); - } - } - }