Merge changes I296b2805,Iee01f474,I13dab228

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

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/FeatureBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/FeatureBuilder.java
index b0d1fc4fb085b838cd4858fde164d6a312b5034f..c2e9a6a689123f1d8612000c7a232f067bebeda0 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/FeatureBuilder.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/FeatureBuilder.java
@@ -7,44 +7,39 @@
  */
 package org.opendaylight.yangtools.yang.parser.builder.impl;
 
-import java.util.Collections;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableList;
 import java.util.List;
-
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.FeatureDefinition;
 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.model.api.YangNode;
-import org.opendaylight.yangtools.yang.parser.builder.api.AbstractSchemaNodeBuilder;
-import org.opendaylight.yangtools.yang.parser.util.Comparators;
+import org.opendaylight.yangtools.yang.parser.builder.api.UnknownSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.util.AbstractSchemaNodeBuilder;
 
 public final class FeatureBuilder extends AbstractSchemaNodeBuilder {
-    private boolean isBuilt;
-    private final FeatureDefinitionImpl instance;
+    private FeatureDefinitionImpl instance;
 
-    FeatureBuilder(final String moduleName, final int line, final QName qname) {
+    FeatureBuilder(final String moduleName, final int line, final QName qname, final SchemaPath path) {
         super(moduleName, line, qname);
-        instance = new FeatureDefinitionImpl(qname);
+        this.schemaPath = Preconditions.checkNotNull(path, "Schema Path must not be null");
     }
 
     @Override
-    public FeatureDefinitionImpl build(YangNode parent) {
-        if (!isBuilt) {
-            instance.setPath(schemaPath);
-            instance.setDescription(description);
-            instance.setReference(reference);
-            instance.setStatus(status);
-
-            // UNKNOWN NODES
-            for (UnknownSchemaNodeBuilder b : addedUnknownNodes) {
-                unknownNodes.add(b.build(null));
-            }
-            Collections.sort(unknownNodes, Comparators.SCHEMA_NODE_COMP);
-            instance.setUnknownSchemaNodes(unknownNodes);
+    public FeatureDefinitionImpl build() {
+        if (instance != null) {
+            return instance;
+        }
 
-            isBuilt = true;
+        instance = new FeatureDefinitionImpl(qname, schemaPath);
+
+        // UNKNOWN NODES
+        for (UnknownSchemaNodeBuilder b : addedUnknownNodes) {
+            unknownNodes.add(b.build());
         }
+        instance.unknownNodes = ImmutableList.copyOf(unknownNodes);
+
         return instance;
     }
 
@@ -53,16 +48,17 @@ public final class FeatureBuilder extends AbstractSchemaNodeBuilder {
         return "feature " + qname.getLocalName();
     }
 
-    private final class FeatureDefinitionImpl implements FeatureDefinition {
+    private static final class FeatureDefinitionImpl implements FeatureDefinition {
         private final QName qname;
-        private SchemaPath path;
+        private final SchemaPath path;
         private String description;
         private String reference;
-        private Status status = Status.CURRENT;
-        private List<UnknownSchemaNode> unknownNodes = Collections.emptyList();
+        private Status status;
+        private ImmutableList<UnknownSchemaNode> unknownNodes;
 
-        private FeatureDefinitionImpl(final QName qname) {
+        private FeatureDefinitionImpl(final QName qname, final SchemaPath path) {
             this.qname = qname;
+            this.path = path;
         }
 
         @Override
@@ -75,50 +71,26 @@ public final class FeatureBuilder extends AbstractSchemaNodeBuilder {
             return path;
         }
 
-        private void setPath(final SchemaPath path) {
-            this.path = path;
-        }
-
         @Override
         public String getDescription() {
             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(Status status) {
-            if (status != null) {
-                this.status = status;
-            }
-        }
-
         @Override
         public List<UnknownSchemaNode> getUnknownSchemaNodes() {
             return unknownNodes;
         }
 
-        private void setUnknownSchemaNodes(final List<UnknownSchemaNode> unknownNodes) {
-            if (unknownNodes != null) {
-                this.unknownNodes = unknownNodes;
-            }
-        }
-
         @Override
         public int hashCode() {
             final int prime = 31;
@@ -129,7 +101,7 @@ public final class FeatureBuilder extends AbstractSchemaNodeBuilder {
         }
 
         @Override
-        public boolean equals(Object obj) {
+        public boolean equals(final Object obj) {
             if (this == obj) {
                 return true;
             }
@@ -160,7 +132,7 @@ public final class FeatureBuilder extends AbstractSchemaNodeBuilder {
         @Override
         public String toString() {
             StringBuilder sb = new StringBuilder(FeatureDefinitionImpl.class.getSimpleName());
-            sb.append("[name=" + qname + "]");
+            sb.append("[name=").append(qname).append("]");
             return sb.toString();
         }
     }