Use String concatenation instead of StringBuffer/Builder

[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 e89e6572f459730a09d1cb30e3956138ec962596..71fae9ea5445bfd8d68f578c031fa22fa60fe636 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
@@ -7,61 +7,45 @@
  */
 package org.opendaylight.yangtools.yang.model.util;
 
+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;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition;
 
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableList;
-
 /**
  * The <code>default</code> implementation of Bits Type Definition interface.
  *
  * @see BitsTypeDefinition
+ * @deprecated Use {@link org.opendaylight.yangtools.yang.model.util.type.BaseTypes#bitsTypeBuilder(SchemaPath)} instead
  */
+@Deprecated
 public final class BitsType implements BitsTypeDefinition {
-    private final static QName NAME = BaseTypes.BITS_QNAME;
-
-    private final SchemaPath path;
-    private final String description = "The bits built-in type represents a bit set.  "
+    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) {
@@ -98,7 +82,8 @@ public final class BitsType implements BitsTypeDefinition {
      */
     @Override
     public Object getDefaultValue() {
-        return bits;
+        // FIXME: Return real bits.
+        return null;
     }
 
     /*
@@ -129,7 +114,7 @@ public final class BitsType implements BitsTypeDefinition {
      */
     @Override
     public String getDescription() {
-        return description;
+        return DESCRIPTION;
     }
 
     /*
@@ -166,8 +151,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 + ((description == null) ? 0 : description.hashCode());
+        result = prime * result + Objects.hashCode(bits);
         result = prime * result + NAME.hashCode();
         result = prime * result + path.hashCode();
         return result;
@@ -185,47 +169,23 @@ public final class BitsType implements BitsTypeDefinition {
             return false;
         }
         BitsType other = (BitsType) obj;
-        if (bits == null) {
-            if (other.bits != null) {
-                return false;
-            }
-        } else if (!bits.equals(other.bits)) {
-            return false;
-        }
-        if (description == null) {
-            if (other.description != null) {
-                return false;
-            }
-        } else if (!description.equals(other.description)) {
-            return false;
-        }
-
-        if (path == null) {
-            if (other.path != null) {
-                return false;
-            }
-        } else if (!path.equals(other.path)) {
-            return false;
-        }
-        return true;
+        return Objects.equals(bits, other.bits) && Objects.equals(path, other.path);
     }
 
     @Override
     public String toString() {
-        StringBuilder builder = new StringBuilder();
-        builder.append("BitsType [name=");
-        builder.append(NAME);
-        builder.append(", path=");
-        builder.append(path);
-        builder.append(", description=");
-        builder.append(description);
-        builder.append(", reference=");
-        builder.append(REFERENCE);
-        builder.append(", bits=");
-        builder.append(bits);
-        builder.append(", units=");
-        builder.append(UNITS);
-        builder.append("]");
-        return builder.toString();
+        return "BitsType [name=" +
+                NAME +
+                ", path=" +
+                path +
+                ", description=" +
+                DESCRIPTION +
+                ", reference=" +
+                REFERENCE +
+                ", bits=" +
+                bits +
+                ", units=" +
+                UNITS +
+                "]";
     }
 }