Make BitsTypeDefinition.Bit only a DocumentedNode.WithStatus

[yangtools.git] / yang / yang-parser-rfc7950 / src / main / java / org / opendaylight / yangtools / yang / parser / rfc7950 / stmt / bit / BitEffectiveStatementImpl.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/bit/BitEffectiveStatementImpl.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/bit/BitEffectiveStatementImpl.java
index d6af45fe096fd1085e04e6c110ba418d8b2cf788..4b01974abffe523e6084cbc8fc2dacfc94fcf3c5 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/bit/BitEffectiveStatementImpl.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/bit/BitEffectiveStatementImpl.java
@@ -7,102 +7,21 @@
  */
 package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.bit;
 
-import com.google.common.collect.ImmutableList;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import org.eclipse.jdt.annotation.NonNull;
-import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.model.api.SchemaPath;
-import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
-import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.BitEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.BitStatement;
-import org.opendaylight.yangtools.yang.model.api.stmt.PositionEffectiveStatement;
-import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition;
 import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractEffectiveDocumentedNode;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
 
-// FIXME: hide this class
-public final class BitEffectiveStatementImpl extends AbstractEffectiveDocumentedNode<QName, BitStatement>
+final class BitEffectiveStatementImpl extends AbstractEffectiveDocumentedNode<String, BitStatement>
         implements BitEffectiveStatement {
 
-    private final QName qname;
-    private final SchemaPath schemaPath;
-    private final Long declaredPosition;
-    private final @NonNull List<UnknownSchemaNode> unknownSchemaNodes;
-
-    BitEffectiveStatementImpl(final StmtContext<QName, BitStatement, ?> ctx) {
+    BitEffectiveStatementImpl(final StmtContext<String, BitStatement, ?> ctx) {
         super(ctx);
-
-        qname = ctx.getStatementArgument();
-        schemaPath = ctx.getSchemaPath().get();
-
-        final List<UnknownSchemaNode> unknownSchemaNodesInit = new ArrayList<>();
-        Long declaredPositionInit = null;
-        for (final EffectiveStatement<?, ?> effectiveStatement : effectiveSubstatements()) {
-            if (effectiveStatement instanceof PositionEffectiveStatement) {
-                declaredPositionInit = ((PositionEffectiveStatement) effectiveStatement).argument();
-            }
-            if (effectiveStatement instanceof UnknownSchemaNode) {
-                unknownSchemaNodesInit.add((UnknownSchemaNode) effectiveStatement);
-            }
-        }
-
-        declaredPosition = declaredPositionInit;
-        unknownSchemaNodes = ImmutableList.copyOf(unknownSchemaNodesInit);
-    }
-
-    public Long getDeclaredPosition() {
-        return declaredPosition;
-    }
-
-    public String getName() {
-        return qname.getLocalName();
-    }
-
-    public QName getQName() {
-        return qname;
-    }
-
-    public SchemaPath getPath() {
-        return schemaPath;
-    }
-
-    @Override
-    public List<UnknownSchemaNode> getUnknownSchemaNodes() {
-        return unknownSchemaNodes;
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + qname.hashCode();
-        result = prime * result + schemaPath.hashCode();
-        result = prime * result + Objects.hashCode(declaredPosition);
-        result = prime * result + Objects.hashCode(unknownSchemaNodes);
-        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 BitsTypeDefinition.Bit other = (BitsTypeDefinition.Bit) obj;
-        return Objects.equals(qname, other.getQName()) && Objects.equals(schemaPath, other.getPath());
     }
 
     @Override
     public String toString() {
-        return BitEffectiveStatementImpl.class.getSimpleName() + "[name=" + qname.getLocalName() + ", position="
-                + declaredPosition + "]";
+        return BitEffectiveStatementImpl.class.getSimpleName() + "[name=" + argument() + ", position="
+                + getDeclaredPosition().orElse(null) + "]";
     }
 }