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%2FGroupingBuilderImpl.java;h=ce166240878e6dec499c0674ab0cc359227f488f;hb=aa0d59e9afecc484e8d0e219d3156e7817266e28;hp=96009d8fd6f55f46661f7e489928b2508fe8ee58;hpb=96a4239245d344118e008ffc214767fb790e93d2;p=yangtools.git

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingBuilderImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingBuilderImpl.java
index 96009d8fd6..ce16624087 100644
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingBuilderImpl.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingBuilderImpl.java
@@ -9,31 +9,25 @@ package org.opendaylight.yangtools.yang.parser.builder.impl;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
-import java.net.URI;
-import java.util.Date;
+import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.GroupingDefinition;
 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.Builder;
 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.TypeDefinitionBuilder;
 import org.opendaylight.yangtools.yang.parser.builder.api.UnknownSchemaNodeBuilder;
-import org.opendaylight.yangtools.yang.parser.builder.util.AbstractDocumentedDataNodeContainer;
 import org.opendaylight.yangtools.yang.parser.builder.util.AbstractDocumentedDataNodeContainerBuilder;
 
 public final class GroupingBuilderImpl extends AbstractDocumentedDataNodeContainerBuilder implements GroupingBuilder {
     private GroupingDefinitionImpl instance;
     // SchemaNode args
     private SchemaPath schemaPath;
-    private String description;
-    private String reference;
-    private Status status = Status.CURRENT;
     // DataSchemaNode args
     private boolean addedByUses;
 
@@ -44,19 +38,11 @@ public final class GroupingBuilderImpl extends AbstractDocumentedDataNodeContain
 
     public GroupingBuilderImpl(final String moduleName, final int line, final QName qname, final SchemaPath path,
             final GroupingDefinition base) {
-        super(moduleName, line, base.getQName(), path, base);
+        super(moduleName, line, base.getQName(), Preconditions.checkNotNull(path, "Schema Path must not be null"), base);
         schemaPath = path;
-
-        description = base.getDescription();
-        reference = base.getReference();
-        status = base.getStatus();
         addedByUses = base.isAddedByUses();
-
-        URI ns = qname.getNamespace();
-        Date rev = qname.getRevision();
-        String pref = qname.getPrefix();
         addedUnknownNodes.addAll(BuilderUtils.wrapUnknownNodes(moduleName, line, base.getUnknownSchemaNodes(), path,
-                ns, rev, pref));
+                qname));
     }
 
     @Override
@@ -78,8 +64,8 @@ public final class GroupingBuilderImpl extends AbstractDocumentedDataNodeContain
     }
 
     @Override
-    public Set<DataSchemaNodeBuilder> instantiateChildNodes(final Builder newParent) {
-        final Set<DataSchemaNodeBuilder> nodes = new HashSet<>();
+    public List<DataSchemaNodeBuilder> instantiateChildNodes(final Builder newParent) {
+        final List<DataSchemaNodeBuilder> nodes = new ArrayList<>();
         for (DataSchemaNodeBuilder node : getChildNodeBuilders()) {
             DataSchemaNodeBuilder copy = CopyUtils.copy(node, newParent, true);
             BuilderUtils.setNodeAddedByUses(copy);
@@ -152,8 +138,8 @@ public final class GroupingBuilderImpl extends AbstractDocumentedDataNodeContain
     public int hashCode() {
         final int prime = 31;
         int result = 1;
-        result = prime * result + ((getParent() == null) ? 0 : getParent().hashCode());
-        result = prime * result + ((schemaPath == null) ? 0 : schemaPath.hashCode());
+        result = prime * result + Objects.hashCode(getParent());
+        result = prime * result + Objects.hashCode(schemaPath);
         return result;
     }
 
@@ -194,86 +180,4 @@ public final class GroupingBuilderImpl extends AbstractDocumentedDataNodeContain
         return "grouping";
     }
 
-    private static final class GroupingDefinitionImpl extends AbstractDocumentedDataNodeContainer implements
-            GroupingDefinition {
-        private final QName qname;
-        private final SchemaPath path;
-
-        private boolean addedByUses;
-        private ImmutableList<UnknownSchemaNode> unknownNodes;
-
-        private GroupingDefinitionImpl(final QName qname, final SchemaPath path, final GroupingBuilderImpl builder) {
-            super(builder);
-            this.qname = qname;
-            this.path = path;
-        }
-
-        @Override
-        public QName getQName() {
-            return qname;
-        }
-
-        @Override
-        public SchemaPath getPath() {
-            return path;
-        }
-
-        @Override
-        public boolean isAddedByUses() {
-            return addedByUses;
-        }
-
-        @Override
-        public List<UnknownSchemaNode> getUnknownSchemaNodes() {
-            return unknownNodes;
-        }
-
-        @Override
-        public int hashCode() {
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + ((qname == null) ? 0 : qname.hashCode());
-            result = prime * result + ((path == null) ? 0 : path.hashCode());
-            return result;
-        }
-
-        @Override
-        public boolean equals(final Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (obj == null) {
-                return false;
-            }
-            if (getClass() != obj.getClass()) {
-                return false;
-            }
-            final GroupingDefinitionImpl other = (GroupingDefinitionImpl) obj;
-            if (qname == null) {
-                if (other.qname != null) {
-                    return false;
-                }
-            } else if (!qname.equals(other.qname)) {
-                return false;
-            }
-            if (path == null) {
-                if (other.path != null) {
-                    return false;
-                }
-            } else if (!path.equals(other.path)) {
-                return false;
-            }
-            return true;
-        }
-
-        @Override
-        public String toString() {
-            StringBuilder sb = new StringBuilder(GroupingDefinitionImpl.class.getSimpleName());
-            sb.append("[");
-            sb.append("qname=").append(qname);
-            sb.append("]");
-            return sb.toString();
-        }
-    }
-
 }