BUG-579: memory improvements in parser's builders.

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

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentitySchemaNodeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentitySchemaNodeBuilder.java
index 909773d987dd360e17df8371cd8cb6b68dfa725d..d084ed0b7f7bb763dd03d16a2b752206adc366d3 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentitySchemaNodeBuilder.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentitySchemaNodeBuilder.java
@@ -7,16 +7,20 @@
  */
 package org.opendaylight.yangtools.yang.parser.builder.impl;
 
-import java.util.*;
-
+import com.google.common.collect.ImmutableList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.model.api.*;
+import org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode;
+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.util.Comparators;
 
 public final class IdentitySchemaNodeBuilder extends AbstractSchemaNodeBuilder {
-    private boolean isBuilt;
-    private final IdentitySchemaNodeImpl instance;
+    private IdentitySchemaNodeImpl instance;
     private IdentitySchemaNode baseIdentity;
     private IdentitySchemaNodeBuilder baseIdentityBuilder;
     private final Set<IdentitySchemaNode> derivedIdentities = new HashSet<>();
@@ -24,8 +28,7 @@ public final class IdentitySchemaNodeBuilder extends AbstractSchemaNodeBuilder {
 
     IdentitySchemaNodeBuilder(final String moduleName, final int line, final QName qname, final SchemaPath path) {
         super(moduleName, line, qname);
-        this.schemaPath = path;
-        instance = new IdentitySchemaNodeImpl(qname, path, derivedIdentities);
+        schemaPath = path;
     }
 
     IdentitySchemaNodeBuilder(final String moduleName, IdentitySchemaNode base) {
@@ -33,66 +36,33 @@ public final class IdentitySchemaNodeBuilder extends AbstractSchemaNodeBuilder {
         schemaPath = base.getPath();
         derivedIdentities.addAll(base.getDerivedIdentities());
         unknownNodes.addAll(base.getUnknownSchemaNodes());
-        instance = new IdentitySchemaNodeImpl(qname, schemaPath, derivedIdentities);
     }
 
     @Override
     public IdentitySchemaNode build() {
-        if (!isBuilt) {
-            if(baseIdentityBuilder != null) {
-                baseIdentityBuilder.addDerivedIdentity(instance);
-                baseIdentity = baseIdentityBuilder.build();
-            }
-            instance.setBaseIdentity(baseIdentity);
-
-            // UNKNOWN NODES
-            for (UnknownSchemaNodeBuilder b : addedUnknownNodes) {
-                unknownNodes.add(b.build());
-            }
-            Collections.sort(unknownNodes, Comparators.SCHEMA_NODE_COMP);
-            instance.addUnknownSchemaNodes(unknownNodes);
-
-            isBuilt = true;
+        if (instance != null) {
+            return instance;
         }
 
-        return instance;
-    }
-
-    @Override
-    public SchemaPath getPath() {
-        return instance.path;
-    }
-
-    @Override
-    public String getDescription() {
-        return instance.description;
-    }
+        instance = new IdentitySchemaNodeImpl(qname, schemaPath, derivedIdentities);
 
-    @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;
-    }
+        instance.status = status;
 
-    @Override
-    public Status getStatus() {
-        return instance.status;
-    }
+        if (baseIdentityBuilder != null) {
+            baseIdentityBuilder.addDerivedIdentity(instance);
+            baseIdentity = baseIdentityBuilder.build();
+        }
+        instance.baseIdentity = baseIdentity;
 
-    @Override
-    public void setStatus(Status status) {
-        if (status != null) {
-            instance.status = status;
+        // UNKNOWN NODES
+        for (UnknownSchemaNodeBuilder b : addedUnknownNodes) {
+            unknownNodes.add(b.build());
         }
+        instance.unknownNodes = ImmutableList.copyOf(unknownNodes);
+
+        return instance;
     }
 
     public String getBaseIdentityName() {
@@ -125,10 +95,11 @@ public final class IdentitySchemaNodeBuilder extends AbstractSchemaNodeBuilder {
         private final Set<IdentitySchemaNode> derivedIdentities;
         private String description;
         private String reference;
-        private Status status = Status.CURRENT;
-        private final List<UnknownSchemaNode> unknownNodes = new ArrayList<>();
+        private Status status;
+        private ImmutableList<UnknownSchemaNode> unknownNodes;
 
-        private IdentitySchemaNodeImpl(final QName qname, final SchemaPath path, final Set<IdentitySchemaNode> derivedIdentities) {
+        private IdentitySchemaNodeImpl(final QName qname, final SchemaPath path,
+                final Set<IdentitySchemaNode> derivedIdentities) {
             this.qname = qname;
             this.path = path;
             this.derivedIdentities = derivedIdentities;
@@ -144,10 +115,6 @@ public final class IdentitySchemaNodeBuilder extends AbstractSchemaNodeBuilder {
             return baseIdentity;
         }
 
-        private void setBaseIdentity(final IdentitySchemaNode baseIdentity) {
-            this.baseIdentity = baseIdentity;
-        }
-
         @Override
         public Set<IdentitySchemaNode> getDerivedIdentities() {
             return Collections.unmodifiableSet(derivedIdentities);
@@ -175,13 +142,7 @@ public final class IdentitySchemaNodeBuilder extends AbstractSchemaNodeBuilder {
 
         @Override
         public List<UnknownSchemaNode> getUnknownSchemaNodes() {
-            return Collections.unmodifiableList(unknownNodes);
-        }
-
-        private void addUnknownSchemaNodes(List<UnknownSchemaNode> unknownSchemaNodes) {
-            if (unknownSchemaNodes != null) {
-                this.unknownNodes.addAll(unknownSchemaNodes);
-            }
+            return unknownNodes;
         }
 
         @Override