Merge "BUG-584: added test-models to integration-test project."

[yangtools.git] / yang / yang-parser-impl / src / main / java / org / opendaylight / yangtools / yang / parser / builder / impl / UnknownSchemaNodeBuilder.java

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnknownSchemaNodeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnknownSchemaNodeBuilder.java
index 64e35abed830e21f8a66ce2cef9e57f230fa36b4..9cd53f2b3ba7bfe61616f3ed171f76dd2b6bd73b 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnknownSchemaNodeBuilder.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnknownSchemaNodeBuilder.java
@@ -22,16 +22,36 @@ import org.opendaylight.yangtools.yang.parser.util.Comparators;
 public final class UnknownSchemaNodeBuilder extends AbstractSchemaNodeBuilder {
     private boolean isBuilt;
     private final UnknownSchemaNodeImpl instance;
-    private boolean addedByUses;
     private QName nodeType;
     private String nodeParameter;
 
     private ExtensionDefinition extensionDefinition;
     private ExtensionBuilder extensionBuilder;
 
-    public UnknownSchemaNodeBuilder(final String moduleName, final int line, final QName qname) {
+    public UnknownSchemaNodeBuilder(final String moduleName, final int line, final QName qname, final SchemaPath path) {
         super(moduleName, line, qname);
-        instance = new UnknownSchemaNodeImpl(qname);
+        this.schemaPath = path;
+        instance = new UnknownSchemaNodeImpl(qname, path);
+    }
+
+    public UnknownSchemaNodeBuilder(final String moduleName, final int line, final QName qname, final SchemaPath path, final UnknownSchemaNode base) {
+        super(moduleName, line, base.getQName());
+        this.schemaPath = path;
+        instance = new UnknownSchemaNodeImpl(qname, path);
+
+        instance.nodeType = base.getNodeType();
+        instance.nodeParameter = base.getNodeParameter();
+        instance.description = base.getDescription();
+        instance.reference = base.getReference();
+        instance.status = base.getStatus();
+        instance.addedByUses = base.isAddedByUses();
+        instance.extension = base.getExtensionDefinition();
+        instance.unknownNodes.addAll(base.getUnknownSchemaNodes());
+    }
+
+    @Override
+    public SchemaPath getPath() {
+        return instance.path;
     }
 
     @Override
@@ -91,13 +111,8 @@ public final class UnknownSchemaNodeBuilder extends AbstractSchemaNodeBuilder {
     @Override
     public UnknownSchemaNode build() {
         if (!isBuilt) {
-            instance.setPath(schemaPath);
             instance.setNodeType(nodeType);
             instance.setNodeParameter(nodeParameter);
-            instance.setDescription(description);
-            instance.setReference(reference);
-            instance.setStatus(status);
-            instance.setAddedByUses(addedByUses);
 
             // EXTENSION
             if (extensionDefinition != null) {
@@ -109,13 +124,10 @@ public final class UnknownSchemaNodeBuilder extends AbstractSchemaNodeBuilder {
             }
 
             // UNKNOWN NODES
-            if (unknownNodes == null) {
-                unknownNodes = new ArrayList<UnknownSchemaNode>();
-                for (UnknownSchemaNodeBuilder b : addedUnknownNodes) {
-                    unknownNodes.add(b.build());
-                }
-                Collections.sort(unknownNodes, Comparators.SCHEMA_NODE_COMP);
+            for (UnknownSchemaNodeBuilder b : addedUnknownNodes) {
+                unknownNodes.add(b.build());
             }
+            Collections.sort(unknownNodes, Comparators.SCHEMA_NODE_COMP);
             instance.setUnknownSchemaNodes(unknownNodes);
 
             isBuilt = true;
@@ -124,16 +136,44 @@ public final class UnknownSchemaNodeBuilder extends AbstractSchemaNodeBuilder {
         return instance;
     }
 
-    public void setQName(QName qname) {
-        this.qname = qname;
+    @Override
+    public String getDescription() {
+        return instance.description;
+    }
+
+    @Override
+    public void setDescription(final String description) {
+        instance.description = description;
+    }
+
+    @Override
+    public String getReference() {
+        return instance.reference;
+    }
+
+    @Override
+    public void setReference(final String reference) {
+        instance.reference = reference;
+    }
+
+    @Override
+    public Status getStatus() {
+        return instance.status;
+    }
+
+    @Override
+    public void setStatus(Status status) {
+        if (status != null) {
+            instance.status = status;
+        }
     }
 
     public boolean isAddedByUses() {
-        return addedByUses;
+        return instance.addedByUses;
     }
 
     public void setAddedByUses(final boolean addedByUses) {
-        this.addedByUses = addedByUses;
+        instance.addedByUses = addedByUses;
     }
 
     public QName getNodeType() {
@@ -179,20 +219,21 @@ public final class UnknownSchemaNodeBuilder extends AbstractSchemaNodeBuilder {
         return sb.toString();
     }
 
-    private final class UnknownSchemaNodeImpl implements UnknownSchemaNode {
+    private static final class UnknownSchemaNodeImpl implements UnknownSchemaNode {
         private final QName qname;
-        private SchemaPath path;
+        private final SchemaPath path;
         private ExtensionDefinition extension;
         private String description;
         private String reference;
         private Status status = Status.CURRENT;
-        private List<UnknownSchemaNode> unknownNodes = Collections.emptyList();
+        private final List<UnknownSchemaNode> unknownNodes = new ArrayList<>();
         private QName nodeType;
         private String nodeParameter;
         private boolean addedByUses;
 
-        private UnknownSchemaNodeImpl(final QName qname) {
+        private UnknownSchemaNodeImpl(final QName qname, final SchemaPath path) {
             this.qname = qname;
+            this.path = path;
         }
 
         @Override
@@ -205,10 +246,6 @@ public final class UnknownSchemaNodeBuilder extends AbstractSchemaNodeBuilder {
             return path;
         }
 
-        private void setPath(final SchemaPath path) {
-            this.path = path;
-        }
-
         @Override
         public ExtensionDefinition getExtensionDefinition() {
             return extension;
@@ -223,39 +260,21 @@ public final class UnknownSchemaNodeBuilder extends AbstractSchemaNodeBuilder {
             return description;
         }
 
-        private void setDescription(final String description) {
-            this.description = description;
-        }
-
         @Override
         public String getReference() {
             return reference;
         }
 
-        private void setReference(final String reference) {
-            this.reference = reference;
-        }
-
         @Override
         public Status getStatus() {
             return status;
         }
 
-        private void setStatus(final Status status) {
-            if (status != null) {
-                this.status = status;
-            }
-        }
-
         @Override
         public boolean isAddedByUses() {
             return addedByUses;
         }
 
-        private void setAddedByUses(final boolean addedByUses) {
-            this.addedByUses = addedByUses;
-        }
-
         @Override
         public List<UnknownSchemaNode> getUnknownSchemaNodes() {
             return unknownNodes;
@@ -263,7 +282,7 @@ public final class UnknownSchemaNodeBuilder extends AbstractSchemaNodeBuilder {
 
         private void setUnknownSchemaNodes(final List<UnknownSchemaNode> unknownNodes) {
             if (unknownNodes != null) {
-                this.unknownNodes = unknownNodes;
+                this.unknownNodes.addAll(unknownNodes);
             }
         }
 
@@ -301,7 +320,7 @@ public final class UnknownSchemaNodeBuilder extends AbstractSchemaNodeBuilder {
             final int prime = 31;
             int result = 1;
             result = prime * result + ((qname == null) ? 0 : qname.hashCode());
-            result = prime * result + ((schemaPath == null) ? 0 : schemaPath.hashCode());
+            result = prime * result + ((path == null) ? 0 : path.hashCode());
             result = prime * result + ((nodeType == null) ? 0 : nodeType.hashCode());
             result = prime * result + ((nodeParameter == null) ? 0 : nodeParameter.hashCode());
             return result;