BUG-865: remove BitImpl

[yangtools.git] / yang / yang-model-util / src / main / java / org / opendaylight / yangtools / yang / model / util / type / BitImpl.java

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BitImpl.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BitImpl.java
similarity index 71%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BitImpl.java
rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BitImpl.java
index 1b03a65734654f1f197d5c7f13a0d7bedb722713..f7edfe22cf665bb6c951ae4cf1e5c989d12a469b 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BitImpl.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BitImpl.java
@@ -1,14 +1,13 @@
 /*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
+ * Copyright (c) 2016 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.yangtools.yang.model.util;
+package org.opendaylight.yangtools.yang.model.util.type;
 
 import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableList;
 import java.util.List;
 import java.util.Objects;
 import org.opendaylight.yangtools.concepts.Immutable;
@@ -16,36 +15,29 @@ import org.opendaylight.yangtools.yang.common.QName;
 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.type.BitsTypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition.Bit;
 
-public final class BitImpl implements BitsTypeDefinition.Bit, Immutable {
-    private final Long position;
-    private final QName qname;
+final class BitImpl implements Bit, Immutable {
+    private final List<UnknownSchemaNode> unknownNodes;
     private final SchemaPath schemaPath;
     private final String description;
     private final String reference;
     private final Status status;
-    private final List<UnknownSchemaNode> unknownNodes;
+    private final Long position;
 
-    public BitImpl(final Long position, final QName qname, final SchemaPath schemaPath, final String description,
+    BitImpl(final SchemaPath schemaPath, final Long position, final String description,
             final String reference, final Status status, final List<UnknownSchemaNode> unknownNodes) {
-        this.position = Preconditions.checkNotNull(position, "Position should not be null");
-        this.qname = Preconditions.checkNotNull(qname, "QName should not be null");
         this.schemaPath = Preconditions.checkNotNull(schemaPath, "Schema Path should not be null");
+        this.position = Preconditions.checkNotNull(position, "Position should not be null");
         this.description = description;
         this.reference = reference;
-        this.status = status;
-        if (unknownNodes != null) {
-            this.unknownNodes = unknownNodes;
-        } else {
-            this.unknownNodes = ImmutableList.of();
-        }
+        this.status = Preconditions.checkNotNull(status);
+        this.unknownNodes = Preconditions.checkNotNull(unknownNodes);
     }
 
     @Override
     public QName getQName() {
-        return qname;
+        return schemaPath.getLastComponent();
     }
 
     @Override
@@ -80,14 +72,14 @@ public final class BitImpl implements BitsTypeDefinition.Bit, Immutable {
 
     @Override
     public String getName() {
-        return qname.getLocalName();
+        return getQName().getLocalName();
     }
 
     @Override
     public int hashCode() {
         final int prime = 31;
         int result = 1;
-        result = prime * result + qname.hashCode();
+        result = prime * result + getQName().hashCode();
         result = prime * result + schemaPath.hashCode();
         result = prime * result + position.hashCode();
         result = prime * result + unknownNodes.hashCode();
@@ -106,12 +98,12 @@ public final class BitImpl implements BitsTypeDefinition.Bit, Immutable {
             return false;
         }
         Bit other = (Bit) obj;
-        return Objects.equals(qname, other.getQName()) && Objects.equals(schemaPath, other.getPath());
+        return Objects.equals(schemaPath, other.getPath());
     }
 
     @Override
     public String toString() {
-        return Bit.class.getSimpleName() + "[name=" + qname.getLocalName() + ", position=" + position + "]";
+        return Bit.class.getSimpleName() + "[name=" + getQName().getLocalName() + ", position=" + position + "]";
     }
 
 }