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=4e3649c44fc192d76e2c754b531c33beb611a17b;hb=54b85dc59a410c1cb945cc124367f131f2b6e384;hp=e099e668c56326dc5425b66e789b20f4e3b62730;hpb=fdf5ee9c3cde2766380c27703055251084ddf61d;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 e099e668c5..4e3649c44f 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,15 +7,18 @@ */ 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.DerivableSchemaNode; import org.opendaylight.yangtools.yang.model.api.ListSchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; @@ -23,16 +26,14 @@ import org.opendaylight.yangtools.yang.parser.builder.api.AugmentationSchemaBuil 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; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; - -public final class ListSchemaNodeBuilder extends AbstractDocumentedDataNodeContainerBuilder implements DataSchemaNodeBuilder, - AugmentationTargetBuilder { +public final class ListSchemaNodeBuilder extends AbstractDocumentedDataNodeContainerBuilder implements + DataSchemaNodeBuilder, AugmentationTargetBuilder { private ListSchemaNodeImpl instance; private boolean userOrdered; private List keys; @@ -42,6 +43,8 @@ public final class ListSchemaNodeBuilder extends AbstractDocumentedDataNodeConta // DataSchemaNode args private boolean augmenting; private boolean addedByUses; + private ListSchemaNodeBuilder originalBuilder; + private ListSchemaNode originalNode; private boolean configuration; private final ConstraintsBuilder constraints; // AugmentationTarget args @@ -56,7 +59,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()); @@ -65,14 +68,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()); } @@ -82,7 +82,7 @@ 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; @@ -91,15 +91,30 @@ public final class ListSchemaNodeBuilder extends AbstractDocumentedDataNodeConta 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); + } + + 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) { @@ -168,6 +183,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; @@ -233,12 +259,14 @@ public final class ListSchemaNodeBuilder extends AbstractDocumentedDataNodeConta return "list " + qname.getLocalName(); } - private static final class ListSchemaNodeImpl extends AbstractDocumentedDataNodeContainer implements ListSchemaNode { + private static final class ListSchemaNodeImpl extends AbstractDocumentedDataNodeContainer implements + ListSchemaNode, DerivableSchemaNode { private final QName qname; private final SchemaPath path; private ImmutableList keyDefinition; private boolean augmenting; private boolean addedByUses; + private ListSchemaNode original; private boolean configuration; private ConstraintDefinition constraints; private ImmutableSet augmentations; @@ -276,6 +304,11 @@ public final class ListSchemaNodeBuilder extends AbstractDocumentedDataNodeConta return addedByUses; } + @Override + public Optional getOriginal() { + return Optional.fromNullable(original); + } + @Override public boolean isConfiguration() { return configuration;