Minor code style improvements to eliminate eclipse warnings.
[yangtools.git] / yang / yang-parser-impl / src / main / java / org / opendaylight / yangtools / yang / parser / builder / impl / UsesNodeBuilderImpl.java
index 8d6190678fe33acd5d60539e1f2c6a348e040b56..c790874a3072934901ebf1a4c0b036d5e6156f18 100644 (file)
@@ -21,7 +21,6 @@ import org.opendaylight.yangtools.yang.model.api.SchemaNode;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.UsesNode;
-import org.opendaylight.yangtools.yang.model.api.YangNode;
 import org.opendaylight.yangtools.yang.parser.builder.api.AbstractBuilder;
 import org.opendaylight.yangtools.yang.parser.builder.api.AugmentationSchemaBuilder;
 import org.opendaylight.yangtools.yang.parser.builder.api.Builder;
@@ -29,8 +28,8 @@ import org.opendaylight.yangtools.yang.parser.builder.api.DataNodeContainerBuild
 import org.opendaylight.yangtools.yang.parser.builder.api.DataSchemaNodeBuilder;
 import org.opendaylight.yangtools.yang.parser.builder.api.GroupingBuilder;
 import org.opendaylight.yangtools.yang.parser.builder.api.SchemaNodeBuilder;
-import org.opendaylight.yangtools.yang.parser.builder.api.TypeDefinitionBuilder;
 import org.opendaylight.yangtools.yang.parser.builder.api.UsesNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.util.Comparators;
 import org.opendaylight.yangtools.yang.parser.util.RefineHolder;
 import org.opendaylight.yangtools.yang.parser.util.YangParseException;
 
@@ -38,95 +37,50 @@ public final class UsesNodeBuilderImpl extends AbstractBuilder implements UsesNo
     private boolean isBuilt;
     private UsesNodeImpl instance;
     private DataNodeContainerBuilder parentBuilder;
-    private final String groupingName;
+    private final String groupingPathString;
     private SchemaPath groupingPath;
     private GroupingDefinition groupingDefinition;
     private GroupingBuilder groupingBuilder;
     private boolean addedByUses;
     private boolean augmenting;
     private boolean resolved;
-    private AugmentationSchemaBuilder parentAugment;
     private final Set<AugmentationSchema> augments = new HashSet<>();
     private final Set<AugmentationSchemaBuilder> addedAugments = new HashSet<>();
     private final List<SchemaNodeBuilder> refineBuilders = new ArrayList<>();
     private final List<RefineHolder> refines = new ArrayList<>();
 
-    /**
-     * Copies of target grouping child nodes.
-     */
-    private final Set<DataSchemaNodeBuilder> targetChildren = new HashSet<>();
-
-    /**
-     * Copies of target grouping groupings.
-     */
-    private final Set<GroupingBuilder> targetGroupings = new HashSet<>();
-
-    /**
-     * Copies of target grouping typedefs.
-     */
-    private final Set<TypeDefinitionBuilder> targetTypedefs = new HashSet<>();
-
-    /**
-     * Copies of target grouping unknown nodes.
-     */
-    private final List<UnknownSchemaNodeBuilder> targetUnknownNodes = new ArrayList<>();
-
-    private final boolean isCopy;
-    private boolean dataCollected;
-
-    @Override
-    public boolean isCopy() {
-        return isCopy;
-    }
-
-    @Override
-    public boolean isDataCollected() {
-        return dataCollected;
-    }
-
-    @Override
-    public void setDataCollected(boolean dataCollected) {
-        this.dataCollected = dataCollected;
-    }
 
     public UsesNodeBuilderImpl(final String moduleName, final int line, final String groupingName) {
         super(moduleName, line);
-        this.groupingName = groupingName;
-        isCopy = false;
-    }
-
-    public UsesNodeBuilderImpl(final String moduleName, final int line, final String groupingName, final boolean isCopy) {
-        super(moduleName, line);
-        this.groupingName = groupingName;
-        this.isCopy = isCopy;
+        this.groupingPathString = groupingName;
     }
 
     @Override
-    public UsesNode build(YangNode parent) {
+    public UsesNode build() {
         if (!isBuilt) {
             instance = new UsesNodeImpl(groupingPath);
             instance.setAddedByUses(addedByUses);
-            instance.setParent(parent);
 
             // AUGMENTATIONS
             for (AugmentationSchemaBuilder builder : addedAugments) {
-                augments.add(builder.build(instance));
+                augments.add(builder.build());
             }
             instance.setAugmentations(augments);
 
             // REFINES
             final Map<SchemaPath, SchemaNode> refineNodes = new HashMap<>();
             for (SchemaNodeBuilder refineBuilder : refineBuilders) {
-                SchemaNode refineNode = refineBuilder.build(instance);
+                SchemaNode refineNode = refineBuilder.build();
                 refineNodes.put(refineNode.getPath(), refineNode);
             }
             instance.setRefines(refineNodes);
 
             // UNKNOWN NODES
             for (UnknownSchemaNodeBuilder b : addedUnknownNodes) {
-                unknownNodes.add(b.build(instance));
+                unknownNodes.add(b.build());
             }
-            instance.setUnknownSchemaNodes(unknownNodes);
+            Collections.sort(unknownNodes, Comparators.SCHEMA_NODE_COMP);
+            instance.addUnknownSchemaNodes(unknownNodes);
 
             isBuilt = true;
         }
@@ -181,7 +135,7 @@ public final class UsesNodeBuilderImpl extends AbstractBuilder implements UsesNo
 
     @Override
     public String getGroupingPathAsString() {
-        return groupingName;
+        return groupingPathString;
     }
 
     @Override
@@ -223,16 +177,6 @@ public final class UsesNodeBuilderImpl extends AbstractBuilder implements UsesNo
         this.resolved = resolved;
     }
 
-    @Override
-    public AugmentationSchemaBuilder getParentAugment() {
-        return parentAugment;
-    }
-
-    @Override
-    public void setParentAugment(AugmentationSchemaBuilder augment) {
-        this.parentAugment = augment;
-    }
-
     @Override
     public List<SchemaNodeBuilder> getRefineNodes() {
         return refineBuilders;
@@ -253,31 +197,11 @@ public final class UsesNodeBuilderImpl extends AbstractBuilder implements UsesNo
         refines.add(refine);
     }
 
-    @Override
-    public Set<DataSchemaNodeBuilder> getTargetChildren() {
-        return targetChildren;
-    }
-
-    @Override
-    public Set<GroupingBuilder> getTargetGroupings() {
-        return targetGroupings;
-    }
-
-    @Override
-    public Set<TypeDefinitionBuilder> getTargetTypedefs() {
-        return targetTypedefs;
-    }
-
-    @Override
-    public List<UnknownSchemaNodeBuilder> getTargetUnknownNodes() {
-        return targetUnknownNodes;
-    }
-
     @Override
     public int hashCode() {
         final int prime = 31;
         int result = 1;
-        result = prime * result + ((groupingName == null) ? 0 : groupingName.hashCode());
+        result = prime * result + ((groupingPathString == null) ? 0 : groupingPathString.hashCode());
         result = prime * result + ((parentBuilder == null) ? 0 : parentBuilder.hashCode());
         return result;
     }
@@ -294,11 +218,11 @@ public final class UsesNodeBuilderImpl extends AbstractBuilder implements UsesNo
             return false;
         }
         UsesNodeBuilderImpl other = (UsesNodeBuilderImpl) obj;
-        if (groupingName == null) {
-            if (other.groupingName != null) {
+        if (groupingPathString == null) {
+            if (other.groupingPathString != null) {
                 return false;
             }
-        } else if (!groupingName.equals(other.groupingName)) {
+        } else if (!groupingPathString.equals(other.groupingPathString)) {
             return false;
         }
         if (parentBuilder == null) {
@@ -313,25 +237,15 @@ public final class UsesNodeBuilderImpl extends AbstractBuilder implements UsesNo
 
     @Override
     public String toString() {
-        return "uses '" + groupingName + "'";
+        return "uses '" + groupingPathString + "'";
     }
 
-    public final class UsesNodeImpl implements UsesNode {
-        private YangNode parent;
+    private static final class UsesNodeImpl implements UsesNode {
         private final SchemaPath groupingPath;
         private Set<AugmentationSchema> augmentations = Collections.emptySet();
         private boolean addedByUses;
         private Map<SchemaPath, SchemaNode> refines = Collections.emptyMap();
-        private List<UnknownSchemaNode> unknownNodes = Collections.emptyList();
-
-        @Override
-        public YangNode getParent() {
-            return parent;
-        }
-
-        private void setParent(YangNode parent) {
-            this.parent = parent;
-        }
+        private final List<UnknownSchemaNode> unknownNodes = new ArrayList<>();
 
         private UsesNodeImpl(final SchemaPath groupingPath) {
             this.groupingPath = groupingPath;
@@ -378,20 +292,12 @@ public final class UsesNodeBuilderImpl extends AbstractBuilder implements UsesNo
             }
         }
 
-        public List<UnknownSchemaNode> getUnknownSchemaNodes() {
-            return unknownNodes;
-        }
-
-        private void setUnknownSchemaNodes(List<UnknownSchemaNode> unknownSchemaNodes) {
+        private void addUnknownSchemaNodes(List<UnknownSchemaNode> unknownSchemaNodes) {
             if (unknownSchemaNodes != null) {
-                this.unknownNodes = unknownSchemaNodes;
+                this.unknownNodes.addAll(unknownSchemaNodes);
             }
         }
 
-        public UsesNodeBuilder toBuilder() {
-            return UsesNodeBuilderImpl.this;
-        }
-
         @Override
         public int hashCode() {
             final int prime = 31;