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=6443d8e62093f1b63feff009dc168fa46418e726;hp=add703a0762b3ef68fd571f2142b0097c15f1765;hpb=49423f30f3759958b5706dd78743f06f9c1475ce;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 add703a076..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
@@ -12,12 +12,18 @@ 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.AbstractSchemaNodeBuilder;
+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 {
@@ -26,26 +32,28 @@ public final class AnyXmlBuilder extends AbstractSchemaNodeBuilder implements Da
     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) {
         super(moduleName, line, qname);
         this.schemaPath = path;
-        constraints = new ConstraintsBuilder(moduleName, line);
+        constraints = new ConstraintsBuilderImpl(moduleName, line);
     }
 
     public AnyXmlBuilder(final String moduleName, final int line, final QName qname, final SchemaPath path,
             final AnyXmlSchemaNode base) {
         super(moduleName, line, qname);
         this.schemaPath = path;
-        constraints = new ConstraintsBuilder(moduleName, line, base.getConstraints());
+        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();
         unknownNodes.addAll(base.getUnknownSchemaNodes());
     }
@@ -64,8 +72,13 @@ public final class AnyXmlBuilder extends AbstractSchemaNodeBuilder implements Da
         instance.augmenting = augmenting;
         instance.addedByUses = addedByUses;
         instance.configuration = configuration;
+        instance.constraintsDef = constraints.toInstance();
 
-        instance.constraintsDef = constraints.build();
+        // ORIGINAL NODE
+        if (originalNode == null && originalBuilder != null) {
+            originalNode = originalBuilder.build();
+        }
+        instance.original = originalNode;
 
         // UNKNOWN NODES
         for (UnknownSchemaNodeBuilder b : addedUnknownNodes) {
@@ -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;
         }
@@ -138,11 +162,11 @@ public final class AnyXmlBuilder extends AbstractSchemaNodeBuilder implements Da
         } else if (!schemaPath.equals(other.schemaPath)) {
             return false;
         }
-        if (parentBuilder == null) {
-            if (other.parentBuilder != null) {
+        if (getParent() == null) {
+            if (other.getParent() != null) {
                 return false;
             }
-        } else if (!parentBuilder.equals(other.parentBuilder)) {
+        } else if (!getParent().equals(other.getParent())) {
             return false;
         }
         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<AnyXmlSchemaNode> 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;
             }
@@ -262,11 +292,12 @@ public final class AnyXmlBuilder extends AbstractSchemaNodeBuilder implements Da
         public String toString() {
             StringBuilder sb = new StringBuilder(AnyXmlSchemaNodeImpl.class.getSimpleName());
             sb.append("[");
-            sb.append("qname=" + qname);
-            sb.append(", path=" + path);
+            sb.append("qname=").append(qname);
+            sb.append(", path=").append(path);
             sb.append("]");
             return sb.toString();
         }
+
     }
 
 }