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%2FAnyXmlBuilder.java;h=19cd4485b15c1833f2ab9e9a6cc9df4e634025d3;hb=44fcb7d28655165df53709a55b098d3dae39883f;hp=e5762d8c27526bf596d91291e6025742d22c7b90;hpb=93e8c16d8deff8cd2935d09c445d2d7082503cb4;p=yangtools.git diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AnyXmlBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AnyXmlBuilder.java index e5762d8c27..19cd4485b1 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AnyXmlBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AnyXmlBuilder.java @@ -7,26 +7,33 @@ */ package org.opendaylight.yangtools.yang.parser.builder.impl; -import com.google.common.collect.ImmutableList; import java.util.List; + import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; import org.opendaylight.yangtools.yang.model.api.ConstraintDefinition; +import org.opendaylight.yangtools.yang.model.api.DerivableSchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; 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.AbstractSchemaNodeBuilder; +import com.google.common.base.Optional; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableList; + public final class AnyXmlBuilder extends AbstractSchemaNodeBuilder implements DataSchemaNodeBuilder { private AnyXmlSchemaNodeImpl instance; private boolean augmenting; private boolean addedByUses; private boolean configuration; - + private AnyXmlSchemaNode originalNode; + private AnyXmlBuilder originalBuilder; private final ConstraintsBuilder constraints; public AnyXmlBuilder(final String moduleName, final int line, final QName qname, final SchemaPath path) { @@ -46,6 +53,7 @@ public final class AnyXmlBuilder extends AbstractSchemaNodeBuilder implements Da status = base.getStatus(); augmenting = base.isAugmenting(); addedByUses = base.isAddedByUses(); + originalNode = base; configuration = base.isConfiguration(); unknownNodes.addAll(base.getUnknownSchemaNodes()); } @@ -64,9 +72,14 @@ public final class AnyXmlBuilder extends AbstractSchemaNodeBuilder implements Da instance.augmenting = augmenting; instance.addedByUses = addedByUses; instance.configuration = configuration; - instance.constraintsDef = constraints.toInstance(); + // ORIGINAL NODE + if (originalNode == null && originalBuilder != null) { + originalNode = originalBuilder.build(); + } + instance.original = originalNode; + // UNKNOWN NODES for (UnknownSchemaNodeBuilder b : addedUnknownNodes) { unknownNodes.add(b.build()); @@ -101,6 +114,17 @@ public final class AnyXmlBuilder extends AbstractSchemaNodeBuilder implements Da this.addedByUses = addedByUses; } + @Override + public AnyXmlBuilder getOriginal() { + return originalBuilder; + } + + @Override + public void setOriginal(final SchemaNodeBuilder builder) { + Preconditions.checkArgument(builder instanceof AnyXmlBuilder, "Original of anyxml cannot be " + builder); + this.originalBuilder = (AnyXmlBuilder) builder; + } + @Override public boolean isConfiguration() { return configuration; @@ -120,7 +144,7 @@ public final class AnyXmlBuilder extends AbstractSchemaNodeBuilder implements Da } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } @@ -153,13 +177,14 @@ public final class AnyXmlBuilder extends AbstractSchemaNodeBuilder implements Da return "anyxml " + qname.getLocalName(); } - private static final class AnyXmlSchemaNodeImpl implements AnyXmlSchemaNode { + private static final class AnyXmlSchemaNodeImpl implements AnyXmlSchemaNode, DerivableSchemaNode { private final QName qname; private final SchemaPath path; private String description; private String reference; private Status status; private boolean configuration; + private AnyXmlSchemaNode original; private ConstraintDefinition constraintsDef; private boolean augmenting; private boolean addedByUses; @@ -205,6 +230,11 @@ public final class AnyXmlBuilder extends AbstractSchemaNodeBuilder implements Da return addedByUses; } + @Override + public Optional getOriginal() { + return Optional.fromNullable(original); + } + @Override public boolean isConfiguration() { return configuration; @@ -230,7 +260,7 @@ public final class AnyXmlBuilder extends AbstractSchemaNodeBuilder implements Da } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } @@ -267,6 +297,7 @@ public final class AnyXmlBuilder extends AbstractSchemaNodeBuilder implements Da sb.append("]"); return sb.toString(); } + } }