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%2FListSchemaNodeBuilder.java;h=994a979b20f1bf2a8822a0b58d9aeb840cf504d2;hb=45251e29ed742b620fd05e80ba10557011ce5c72;hp=79cdf048e9a8e9222da5f7a6cb98907c52a1cd07;hpb=224551fcb0190fe3fac9027d228374e2ba3bb880;p=yangtools.git diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ListSchemaNodeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ListSchemaNodeBuilder.java index 79cdf048e9..994a979b20 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ListSchemaNodeBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ListSchemaNodeBuilder.java @@ -7,51 +7,44 @@ */ package org.opendaylight.yangtools.yang.parser.builder.impl; -import java.net.URI; +import com.google.common.base.Optional; +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 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.DataSchemaNode; -import org.opendaylight.yangtools.yang.model.api.GroupingDefinition; +import org.opendaylight.yangtools.yang.model.api.DerivableSchemaNode; import org.opendaylight.yangtools.yang.model.api.ListSchemaNode; 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.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 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; - -public final class ListSchemaNodeBuilder extends AbstractDataNodeContainerBuilder implements DataSchemaNodeBuilder, - AugmentationTargetBuilder { +public final class ListSchemaNodeBuilder extends AbstractDocumentedDataNodeContainerBuilder implements + DataSchemaNodeBuilder, AugmentationTargetBuilder { private ListSchemaNodeImpl instance; private boolean userOrdered; private List keys; private List keyDefinition; // SchemaNode args private SchemaPath schemaPath; - private String description; - private String reference; - private Status status = Status.CURRENT; // DataSchemaNode args private boolean augmenting; private boolean addedByUses; + private ListSchemaNodeBuilder originalBuilder; + private ListSchemaNode originalNode; private boolean configuration; private final ConstraintsBuilder constraints; // AugmentationTarget args @@ -60,37 +53,27 @@ public final class ListSchemaNodeBuilder extends AbstractDataNodeContainerBuilde public ListSchemaNodeBuilder(final String moduleName, final int line, final QName qname, final SchemaPath path) { super(moduleName, line, qname); - this.schemaPath = path; - constraints = new ConstraintsBuilder(moduleName, line); + this.schemaPath = Preconditions.checkNotNull(path, "Schema Path must not be null"); + constraints = new ConstraintsBuilderImpl(moduleName, line); } public ListSchemaNodeBuilder(final String moduleName, final int line, final QName qname, final SchemaPath path, final ListSchemaNode base) { - super(moduleName, line, qname); - schemaPath = path; - constraints = new ConstraintsBuilder(moduleName, line, base.getConstraints()); + super(moduleName, line, qname, path, base); + this.schemaPath = Preconditions.checkNotNull(path, "Schema Path must not be null"); + constraints = new ConstraintsBuilderImpl(moduleName, line, base.getConstraints()); keyDefinition = ImmutableList.copyOf(base.getKeyDefinition()); userOrdered = base.isUserOrdered(); - description = base.getDescription(); - reference = base.getReference(); - status = base.getStatus(); augmenting = base.isAugmenting(); addedByUses = base.isAddedByUses(); + originalNode = base; configuration = base.isConfiguration(); - 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)); - + addedUnknownNodes.addAll(BuilderUtils.wrapUnknownNodes(moduleName, line, base.getUnknownSchemaNodes(), path, + qname)); augmentations.addAll(base.getAvailableAugmentations()); - usesNodes.addAll(base.getUses()); } @Override @@ -98,52 +81,36 @@ public final class ListSchemaNodeBuilder extends AbstractDataNodeContainerBuilde if (instance != null) { return instance; } + buildChildren(); + instance = new ListSchemaNodeImpl(qname, schemaPath, this); - instance = new ListSchemaNodeImpl(qname, schemaPath); - - instance.description = description; - instance.reference = reference; - instance.status = status; instance.augmenting = augmenting; instance.addedByUses = addedByUses; instance.configuration = configuration; - instance.constraints = constraints.build(); + instance.constraints = constraints.toInstance(); instance.userOrdered = userOrdered; - // CHILD NODES - for (DataSchemaNodeBuilder node : addedChildNodes) { - childNodes.add(node.build()); - } - instance.childNodes = ImmutableSet.copyOf(childNodes); - // KEY if (keys == null) { instance.keyDefinition = ImmutableList.of(); } else { keyDefinition = new ArrayList<>(); for (String key : keys) { - keyDefinition.add(instance.getDataChildByName(key).getQName()); + DataSchemaNode keyPart = instance.getDataChildByName(key); + if (keyPart == null) { + throw new YangParseException(getModuleName(), getLine(), "Failed to resolve list key for name " + + key); + } + keyDefinition.add(keyPart.getQName()); } instance.keyDefinition = ImmutableList.copyOf(keyDefinition); } - // GROUPINGS - for (GroupingBuilder builder : addedGroupings) { - groupings.add(builder.build()); + // ORIGINAL NODE + if (originalNode == null && originalBuilder != null) { + originalNode = originalBuilder.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()); - } - instance.uses = ImmutableSet.copyOf(usesNodes); + instance.original = originalNode; // AUGMENTATIONS for (AugmentationSchemaBuilder builder : augmentationBuilders) { @@ -161,20 +128,8 @@ public final class ListSchemaNodeBuilder extends AbstractDataNodeContainerBuilde } @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); + protected String getStatementName() { + return "list"; } @Override @@ -183,40 +138,10 @@ public final class ListSchemaNodeBuilder extends AbstractDataNodeContainerBuilde } @Override - public void setPath(SchemaPath path) { + public void setPath(final SchemaPath path) { this.schemaPath = 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(Status status) { - this.status = Preconditions.checkNotNull(status, "status cannot be null"); - } - @Override public void addAugmentation(final AugmentationSchemaBuilder augment) { augmentationBuilders.add(augment); @@ -240,7 +165,7 @@ public final class ListSchemaNodeBuilder extends AbstractDataNodeContainerBuilde } @Override - public void setAugmenting(boolean augmenting) { + public void setAugmenting(final boolean augmenting) { this.augmenting = augmenting; } @@ -254,13 +179,24 @@ public final class ListSchemaNodeBuilder extends AbstractDataNodeContainerBuilde this.addedByUses = addedByUses; } + @Override + public ListSchemaNodeBuilder getOriginal() { + return originalBuilder; + } + + @Override + public void setOriginal(final SchemaNodeBuilder builder) { + Preconditions.checkArgument(builder instanceof ListSchemaNodeBuilder, "Original of list cannot be " + builder); + this.originalBuilder = (ListSchemaNodeBuilder) builder; + } + @Override public boolean isConfiguration() { return configuration; } @Override - public void setConfiguration(boolean configuration) { + public void setConfiguration(final boolean configuration) { this.configuration = configuration; } @@ -319,26 +255,22 @@ public final class ListSchemaNodeBuilder extends AbstractDataNodeContainerBuilde return "list " + qname.getLocalName(); } - private static final class ListSchemaNodeImpl implements ListSchemaNode { + private static final class ListSchemaNodeImpl extends AbstractDocumentedDataNodeContainer implements + ListSchemaNode, DerivableSchemaNode { private final QName qname; private final SchemaPath path; - private String description; - private String reference; - private Status status; private ImmutableList keyDefinition; private boolean augmenting; private boolean addedByUses; + private ListSchemaNode original; 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 userOrdered; - private ListSchemaNodeImpl(final QName qname, final SchemaPath path) { + private ListSchemaNodeImpl(final QName qname, final SchemaPath path, final ListSchemaNodeBuilder builder) { + super(builder); this.qname = qname; this.path = path; } @@ -353,21 +285,6 @@ public final class ListSchemaNodeBuilder extends AbstractDataNodeContainerBuilde return path; } - @Override - public String getDescription() { - return description; - } - - @Override - public String getReference() { - return reference; - } - - @Override - public Status getStatus() { - return status; - } - @Override public List getKeyDefinition() { return keyDefinition; @@ -383,6 +300,11 @@ public final class ListSchemaNodeBuilder extends AbstractDataNodeContainerBuilde return addedByUses; } + @Override + public Optional getOriginal() { + return Optional.fromNullable(original); + } + @Override public boolean isConfiguration() { return configuration; @@ -398,36 +320,6 @@ public final class ListSchemaNodeBuilder extends AbstractDataNodeContainerBuilde return augmentations; } - @Override - public Set getChildNodes() { - return childNodes; - } - - @Override - public Set getGroupings() { - return groupings; - } - - @Override - public Set> getTypeDefinitions() { - return typeDefinitions; - } - - @Override - public Set getUses() { - return uses; - } - - @Override - public DataSchemaNode getDataChildByName(final QName name) { - return getChildNode(childNodes, name); - } - - @Override - public DataSchemaNode getDataChildByName(final String name) { - return getChildNode(childNodes, name); - } - @Override public boolean isUserOrdered() { return userOrdered;