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=dbd0951cde02edbe761f0e420261daad2b1d3788;hb=42abb28b99a02f9580f4676ce5c315628e5bcd24;hp=e251aacb87518b16808fc5ea294ed7eadd0b069f;hpb=3732594ea24d5f39f742631e0a38e3f917f3658a;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 e251aacb87..dbd0951cde 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 @@ -10,36 +10,42 @@ package org.opendaylight.yangtools.yang.parser.builder.impl; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import java.net.URI; import java.util.ArrayList; -import java.util.Date; import java.util.List; +import java.util.Objects; 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.LeafSchemaNode; import org.opendaylight.yangtools.yang.model.api.ListSchemaNode; 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.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; -public final class ListSchemaNodeBuilder extends AbstractDocumentedDataNodeContainerBuilder implements DataSchemaNodeBuilder, - AugmentationTargetBuilder { +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated +public final class ListSchemaNodeBuilder extends AbstractDocumentedDataNodeContainerBuilder implements + DataSchemaNodeBuilder, AugmentationTargetBuilder { private ListSchemaNodeImpl instance; private boolean userOrdered; - private List keys; + private Set keys; private List keyDefinition; // SchemaNode args private SchemaPath schemaPath; // DataSchemaNode args private boolean augmenting; private boolean addedByUses; + private ListSchemaNodeBuilder originalBuilder; + private ListSchemaNode originalNode; private boolean configuration; private final ConstraintsBuilder constraints; // AugmentationTarget args @@ -54,7 +60,7 @@ public final class ListSchemaNodeBuilder extends AbstractDocumentedDataNodeConta public ListSchemaNodeBuilder(final String moduleName, final int line, final QName qname, final SchemaPath path, final ListSchemaNode base) { - super(moduleName, line, qname,path,base); + super(moduleName, line, qname, path, base); this.schemaPath = Preconditions.checkNotNull(path, "Schema Path must not be null"); constraints = new ConstraintsBuilderImpl(moduleName, line, base.getConstraints()); @@ -63,14 +69,11 @@ public final class ListSchemaNodeBuilder extends AbstractDocumentedDataNodeConta augmenting = base.isAugmenting(); addedByUses = base.isAddedByUses(); + originalNode = base; configuration = base.isConfiguration(); - URI ns = qname.getNamespace(); - Date rev = qname.getRevision(); - String pref = qname.getPrefix(); - addedUnknownNodes.addAll(BuilderUtils.wrapUnknownNodes(moduleName, line, base.getUnknownSchemaNodes(), path, ns, - rev, pref)); - + addedUnknownNodes.addAll(BuilderUtils.wrapUnknownNodes(moduleName, line, base.getUnknownSchemaNodes(), path, + qname)); augmentations.addAll(base.getAvailableAugmentations()); } @@ -80,25 +83,45 @@ public final class ListSchemaNodeBuilder extends AbstractDocumentedDataNodeConta return instance; } buildChildren(); - instance = new ListSchemaNodeImpl(qname, schemaPath,this); + instance = new ListSchemaNodeImpl(qname, schemaPath, this); instance.augmenting = augmenting; instance.addedByUses = addedByUses; instance.configuration = configuration; - instance.constraints = constraints.toInstance(); + instance.constraints = constraints.build(); instance.userOrdered = userOrdered; // KEY - if (keys == null) { - instance.keyDefinition = ImmutableList.of(); - } else { + if (keys != null) { 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); + } + + if (!(keyPart instanceof LeafSchemaNode)) { + throw new YangParseException(getModuleName(), getLine(), "List key : \"" + key + + "\" does not reference any Leaf of the List"); + } + + final QName qname = keyPart.getQName(); + if (!keyDefinition.contains(qname)) { + keyDefinition.add(qname); + } } instance.keyDefinition = ImmutableList.copyOf(keyDefinition); + } else { + instance.keyDefinition = ImmutableList.of(); } + // ORIGINAL NODE + if (originalNode == null && originalBuilder != null) { + originalNode = originalBuilder.build(); + } + instance.original = originalNode; + // AUGMENTATIONS for (AugmentationSchemaBuilder builder : augmentationBuilders) { augmentations.add(builder.build()); @@ -138,11 +161,11 @@ public final class ListSchemaNodeBuilder extends AbstractDocumentedDataNodeConta return augmentationBuilders; } - public List getKeys() { + public Set getKeys() { return keys; } - public void setKeys(final List keys) { + public void setKeys(final Set keys) { this.keys = keys; } @@ -166,6 +189,17 @@ public final class ListSchemaNodeBuilder extends AbstractDocumentedDataNodeConta 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; @@ -193,7 +227,7 @@ public final class ListSchemaNodeBuilder extends AbstractDocumentedDataNodeConta public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((schemaPath == null) ? 0 : schemaPath.hashCode()); + result = prime * result + Objects.hashCode(schemaPath); return result; } @@ -231,116 +265,4 @@ public final class ListSchemaNodeBuilder extends AbstractDocumentedDataNodeConta return "list " + qname.getLocalName(); } - private static final class ListSchemaNodeImpl extends AbstractDocumentedDataNodeContainer implements ListSchemaNode { - private final QName qname; - private final SchemaPath path; - private ImmutableList keyDefinition; - private boolean augmenting; - private boolean addedByUses; - private boolean configuration; - private ConstraintDefinition constraints; - private ImmutableSet augmentations; - private ImmutableList unknownNodes; - private boolean userOrdered; - - private ListSchemaNodeImpl(final QName qname, final SchemaPath path, final ListSchemaNodeBuilder builder) { - super(builder); - this.qname = qname; - this.path = path; - } - - @Override - public QName getQName() { - return qname; - } - - @Override - public SchemaPath getPath() { - return path; - } - - @Override - public List getKeyDefinition() { - return keyDefinition; - } - - @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 boolean isUserOrdered() { - return userOrdered; - } - - @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; - } - final ListSchemaNodeImpl other = (ListSchemaNodeImpl) 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 "list " + qname.getLocalName(); - } - } - }