Use Objects.hashCode()

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

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BitsType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BitsType.java
index 20f8c881a912235c01746fbf4f7606609ab1d004..85b214d32d569332e4ba1dc046aff0f1edd6cb36 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BitsType.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BitsType.java
@@ -11,6 +11,7 @@ import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.Status;
@@ -23,43 +24,26 @@ import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition;
  * @see BitsTypeDefinition
  */
 public final class BitsType implements BitsTypeDefinition {
-    private final static QName NAME = BaseTypes.BITS_QNAME;
-
-    private final SchemaPath path;
+    private static final QName NAME = BaseTypes.BITS_QNAME;
     private static final String DESCRIPTION = "The bits built-in type represents a bit set. "
             + "That is, a bits value is a set of flags identified by small integer position "
             + "numbers starting at 0.  Each bit number has an assigned name.";
 
     private static final String REFERENCE = "https://tools.ietf.org/html/rfc6020#section-9.7";
-    private final List<Bit> bits;
     private static final String UNITS = "";
-
-    /**
-     * Default constructor. <br>
-     * Instantiates Bits type as empty bits list.
-     *
-     * @param path
-     * @deprecated Use static factory method {@link #create(SchemaPath, List)} instead.
-     */
-    @Deprecated
-    public BitsType(final SchemaPath path) {
-        super();
-        this.bits = Collections.emptyList();
-        this.path = Preconditions.checkNotNull(path,"path must not be null");
-    }
+    private final SchemaPath path;
+    private final List<Bit> bits;
 
     /**
      * Constructor with explicit definition of bits assigned to BitsType.
      *
      * @param path
      * @param bits
-     * @deprecated Use static factory method {@link #create(SchemaPath, List)} instead.
      */
-    @Deprecated
-    public BitsType(final SchemaPath path, final List<Bit> bits) {
+    private BitsType(final SchemaPath path, final List<Bit> bits) {
         super();
         this.bits = ImmutableList.copyOf(bits);
-        this.path = Preconditions.checkNotNull(path,"path must not be null");
+        this.path = Preconditions.checkNotNull(path, "path must not be null");
     }
 
     public static BitsType create(final SchemaPath path, final List<Bit> bits) {
@@ -164,7 +148,7 @@ public final class BitsType implements BitsTypeDefinition {
     public int hashCode() {
         final int prime = 31;
         int result = 1;
-        result = prime * result + ((bits == null) ? 0 : bits.hashCode());
+        result = prime * result + Objects.hashCode(bits);
         result = prime * result + NAME.hashCode();
         result = prime * result + path.hashCode();
         return result;