Decouple HashCodeBuilder from Builder

[yangtools.git] / common / util / src / main / java / org / opendaylight / yangtools / util / ConstantArrayCollection.java

diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/ConstantArrayCollection.java b/common/util/src/main/java/org/opendaylight/yangtools/util/ConstantArrayCollection.java
index 8c29d9e0b9949e716bd05190d3ba20260c232bd0..d843a36ddede5ba1e507d69a9917261084c1c7d2 100644 (file)
--- a/common/util/src/main/java/org/opendaylight/yangtools/util/ConstantArrayCollection.java
+++ b/common/util/src/main/java/org/opendaylight/yangtools/util/ConstantArrayCollection.java
@@ -7,7 +7,8 @@
  */
 package org.opendaylight.yangtools.util;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.collect.UnmodifiableIterator;
 import java.io.Serializable;
 import java.util.Arrays;
@@ -15,6 +16,7 @@ import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
+import org.eclipse.jdt.annotation.NonNull;
 
 /**
  * Internal array-backed {@link List}. It assumes the array does not contain nulls and it does not get modified
@@ -25,10 +27,10 @@ import java.util.NoSuchElementException;
  */
 final class ConstantArrayCollection<E> implements Collection<E>, Serializable {
     private static final long serialVersionUID = 1L;
-    private final E[] array;
+    private final E @NonNull[] array;
 
-    ConstantArrayCollection(final E[] array) {
-        this.array = Preconditions.checkNotNull(array);
+    ConstantArrayCollection(final E @NonNull[] array) {
+        this.array = requireNonNull(array);
     }
 
     @Override
@@ -42,6 +44,7 @@ final class ConstantArrayCollection<E> implements Collection<E>, Serializable {
     }
 
     @Override
+    @SuppressWarnings("checkstyle:parameterName")
     public boolean contains(final Object o) {
         for (Object wlk : array) {
             if (o.equals(wlk)) {
@@ -52,31 +55,16 @@ final class ConstantArrayCollection<E> implements Collection<E>, Serializable {
     }
 
     @Override
-    public Iterator<E> iterator() {
-        return new UnmodifiableIterator<E>() {
-            private int i = 0;
-
-            @Override
-            public boolean hasNext() {
-                return i < array.length;
-            }
-
-            @Override
-            public E next() {
-                if (i >= array.length) {
-                    throw new NoSuchElementException();
-                }
-                return array[i++];
-            }
-        };
+    public @NonNull Iterator<E> iterator() {
+        return new Itr<>(array);
     }
 
     @Override
-    public Object[] toArray() {
+    public Object @NonNull[] toArray() {
         return array.clone();
     }
 
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({ "unchecked", "checkstyle:parameterName" })
     @Override
     public <T> T[] toArray(final T[] a) {
         if (a.length < array.length) {
@@ -91,16 +79,19 @@ final class ConstantArrayCollection<E> implements Collection<E>, Serializable {
     }
 
     @Override
+    @SuppressWarnings("checkstyle:parameterName")
     public boolean add(final E e) {
         throw new UnsupportedOperationException();
     }
 
     @Override
+    @SuppressWarnings("checkstyle:parameterName")
     public boolean remove(final Object o) {
         throw new UnsupportedOperationException();
     }
 
     @Override
+    @SuppressWarnings("checkstyle:parameterName")
     public boolean containsAll(final Collection<?> c) {
         for (Object o : c) {
             if (!contains(o)) {
@@ -112,16 +103,19 @@ final class ConstantArrayCollection<E> implements Collection<E>, Serializable {
     }
 
     @Override
+    @SuppressWarnings("checkstyle:parameterName")
     public boolean addAll(final Collection<? extends E> c) {
         throw new UnsupportedOperationException();
     }
 
     @Override
+    @SuppressWarnings("checkstyle:parameterName")
     public boolean removeAll(final Collection<?> c) {
         throw new UnsupportedOperationException();
     }
 
     @Override
+    @SuppressWarnings("checkstyle:parameterName")
     public boolean retainAll(final Collection<?> c) {
         throw new UnsupportedOperationException();
     }
@@ -142,30 +136,43 @@ final class ConstantArrayCollection<E> implements Collection<E>, Serializable {
 
     @Override
     public boolean equals(final Object obj) {
-        if (obj == this) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (!(obj instanceof ConstantArrayCollection)) {
-            return false;
-        }
-
-        return Arrays.equals(array, ((ConstantArrayCollection<?>) obj).array);
+        return obj == this || obj instanceof ConstantArrayCollection
+                && Arrays.equals(array, ((ConstantArrayCollection<?>) obj).array);
     }
 
     @Override
-    public String toString() {
+    public @NonNull String toString() {
         if (array.length == 0) {
             return "[]";
         }
 
-        StringBuilder sb = new StringBuilder("[");
-        int i = 0;
-        while (i < array.length - 1) {
-            sb.append(String.valueOf(array[i++])).append(", ");
+        final StringBuilder sb = new StringBuilder("[");
+        int offset = 0;
+        while (offset < array.length - 1) {
+            sb.append(String.valueOf(array[offset++])).append(", ");
+        }
+        return sb.append(String.valueOf(array[offset])).append(']').toString();
+    }
+
+    private static final class Itr<E> extends UnmodifiableIterator<E> {
+        private final E @NonNull[] array;
+        private int offset = 0;
+
+        Itr(final E @NonNull[] array) {
+            this.array = array;
+        }
+
+        @Override
+        public boolean hasNext() {
+            return offset < array.length;
+        }
+
+        @Override
+        public E next() {
+            if (offset >= array.length) {
+                throw new NoSuchElementException();
+            }
+            return array[offset++];
         }
-        return sb.append(String.valueOf(array[i])).append(']').toString();
     }
 }