[Java] Tidy up error messages and warnings.

chinaren2003 · Aug 16, 2018 · e72a3b8 · e72a3b8
1 parent 797f16c
commit e72a3b8
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 26 deletions.
diff --git a/agrona/src/main/java/org/agrona/collections/BiInt2ObjectMap.java b/agrona/src/main/java/org/agrona/collections/BiInt2ObjectMap.java
@@ -404,7 +404,7 @@ private void increaseCapacity()
         final int newCapacity = values.length << 1;
         if (newCapacity < 0)
         {
-            throw new IllegalStateException("Max capacity reached at size=" + size);
+            throw new IllegalStateException("max capacity reached at size=" + size);
         }
 
         rehash(newCapacity);

diff --git a/agrona/src/main/java/org/agrona/collections/CollectionUtil.java b/agrona/src/main/java/org/agrona/collections/CollectionUtil.java
@@ -83,7 +83,7 @@ public static void validateLoadFactor(final float loadFactor)
     {
         if (loadFactor < 0.1f || loadFactor > 0.9f)
         {
-            throw new IllegalArgumentException("Load factor must be in the range of 0.1 to 0.9: " + loadFactor);
+            throw new IllegalArgumentException("load factor must be in the range of 0.1 to 0.9: " + loadFactor);
         }
     }
 
@@ -96,7 +96,7 @@ public static void validatePositivePowerOfTwo(final int value)
     {
         if (value > 0 && 1 == (value & (value - 1)))
         {
-            throw new IllegalStateException("Value must be a positive power of two");
+            throw new IllegalStateException("value must be a positive power of two");
         }
     }
 

diff --git a/agrona/src/main/java/org/agrona/collections/Int2IntCounterMap.java b/agrona/src/main/java/org/agrona/collections/Int2IntCounterMap.java
@@ -164,7 +164,7 @@ public int put(final int key, final int value)
     {
         if (value == initialValue)
         {
-            throw new IllegalArgumentException("Cannot accept initialValue");
+            throw new IllegalArgumentException("cannot accept initialValue");
         }
 
         final int[] entries = this.entries;
@@ -566,7 +566,7 @@ private void capacity(@DoNotSub final int newCapacity)
         @DoNotSub final int entriesLength = newCapacity * 2;
         if (entriesLength < 0)
         {
-            throw new IllegalStateException("Max capacity reached at size=" + size);
+            throw new IllegalStateException("max capacity reached at size=" + size);
         }
 
         /*@DoNotSub*/ resizeThreshold = (int)(newCapacity * loadFactor);

diff --git a/agrona/src/main/java/org/agrona/collections/Int2IntHashMap.java b/agrona/src/main/java/org/agrona/collections/Int2IntHashMap.java
@@ -170,7 +170,7 @@ public int put(final int key, final int value)
     {
         if (value == missingValue)
         {
-            throw new IllegalArgumentException("Cannot accept missingValue");
+            throw new IllegalArgumentException("cannot accept missingValue");
         }
 
         final int[] entries = this.entries;
@@ -657,7 +657,7 @@ private void capacity(@DoNotSub final int newCapacity)
         @DoNotSub final int entriesLength = newCapacity * 2;
         if (entriesLength < 0)
         {
-            throw new IllegalStateException("Max capacity reached at size=" + size);
+            throw new IllegalStateException("max capacity reached at size=" + size);
         }
 
         /*@DoNotSub*/ resizeThreshold = (int)(newCapacity * loadFactor);

diff --git a/agrona/src/main/java/org/agrona/collections/Int2ObjectCache.java b/agrona/src/main/java/org/agrona/collections/Int2ObjectCache.java
@@ -68,12 +68,12 @@ public Int2ObjectCache(
     {
         validatePositivePowerOfTwo(numSets);
         validatePositivePowerOfTwo(setSize);
-        requireNonNull(evictionConsumer, "Null values are not permitted");
+        requireNonNull(evictionConsumer, "null values are not permitted");
 
         if (((long)numSets) * setSize > (Integer.MAX_VALUE - 8))
         {
             throw new IllegalArgumentException(
-                "Total capacity must be <= max array size: numSets=" + numSets + " setSize=" + setSize);
+                "total capacity must be <= max array size: numSets=" + numSets + " setSize=" + setSize);
         }
 
         this.setSize = setSize;

diff --git a/agrona/src/main/java/org/agrona/collections/Int2ObjectHashMap.java b/agrona/src/main/java/org/agrona/collections/Int2ObjectHashMap.java
@@ -928,7 +928,7 @@ public V setValue(final V value)
                     return Integer.hashCode(getIntKey()) ^ (v != null ? v.hashCode() : 0);
                 }
 
-                @DoNotSub public boolean equals(final Object o)
+                public boolean equals(final Object o)
                 {
                     if (!(o instanceof Entry))
                     {

diff --git a/agrona/src/main/java/org/agrona/collections/IntArrayList.java b/agrona/src/main/java/org/agrona/collections/IntArrayList.java
@@ -98,13 +98,13 @@ public void wrap(
         if (initialSize < 0 || initialSize > initialElements.length)
         {
             throw new IllegalArgumentException(
-                "Illegal initial size " + initialSize + " for array length of " + initialElements.length);
+                "illegal initial size " + initialSize + " for array length of " + initialElements.length);
         }
 
         if (initialElements.length < INITIAL_CAPACITY)
         {
             throw new IllegalArgumentException(
-                "Illegal initial array length " + initialElements.length + ", minimum required is " + INITIAL_CAPACITY);
+                "illegal initial array length " + initialElements.length + ", minimum required is " + INITIAL_CAPACITY);
         }
 
         elements = initialElements;
@@ -603,7 +603,7 @@ private void ensureCapacityPrivate(@DoNotSub final int requiredCapacity)
             {
                 if (currentCapacity == MAX_CAPACITY)
                 {
-                    throw new IllegalStateException("Max capacity reached: " + MAX_CAPACITY);
+                    throw new IllegalStateException("max capacity reached: " + MAX_CAPACITY);
                 }
 
                 newCapacity = MAX_CAPACITY;

diff --git a/agrona/src/main/java/org/agrona/collections/IntHashSet.java b/agrona/src/main/java/org/agrona/collections/IntHashSet.java
@@ -200,7 +200,7 @@ private void increaseCapacity()
         @DoNotSub final int newCapacity = values.length * 2;
         if (newCapacity < 0)
         {
-            throw new IllegalStateException("Max capacity reached at size=" + size());
+            throw new IllegalStateException("max capacity reached at size=" + size());
         }
 
         rehash(newCapacity);
@@ -545,7 +545,7 @@ public void copy(final IntHashSet that)
     {
         if (this.values.length != that.values.length)
         {
-            throw new IllegalArgumentException("Cannot copy object: masks not equal");
+            throw new IllegalArgumentException("cannot copy object: masks not equal");
         }
 
         System.arraycopy(that.values, 0, this.values, 0, this.values.length);
@@ -595,7 +595,7 @@ public <T> T[] toArray(final T[] into)
         final Class<?> componentType = into.getClass().getComponentType();
         if (!componentType.isAssignableFrom(Integer.class))
         {
-            throw new ArrayStoreException("Cannot store Integers in array of type " + componentType);
+            throw new ArrayStoreException("cannot store Integers in array of type " + componentType);
         }
 
         @DoNotSub final int size = size();

diff --git a/agrona/src/main/java/org/agrona/collections/Object2IntHashMap.java b/agrona/src/main/java/org/agrona/collections/Object2IntHashMap.java
@@ -311,7 +311,7 @@ public int put(final K key, final int value)
     {
         if (value == missingValue)
         {
-            throw new IllegalArgumentException("Cannot accept missingValue");
+            throw new IllegalArgumentException("cannot accept missingValue");
         }
 
         int oldValue = missingValue;
@@ -592,7 +592,7 @@ private void increaseCapacity()
         @DoNotSub final int newCapacity = values.length << 1;
         if (newCapacity < 0)
         {
-            throw new IllegalStateException("Max capacity reached at size=" + size);
+            throw new IllegalStateException("max capacity reached at size=" + size);
         }
 
         rehash(newCapacity);
@@ -989,7 +989,7 @@ public int setValue(final int value)
         {
             if (value == missingValue)
             {
-                throw new IllegalArgumentException("Cannot accept missingValue");
+                throw new IllegalArgumentException("cannot accept missingValue");
             }
 
             @DoNotSub final int pos = position();

diff --git a/agrona/src/main/java/org/agrona/collections/Object2ObjectHashMap.java b/agrona/src/main/java/org/agrona/collections/Object2ObjectHashMap.java
@@ -159,7 +159,7 @@ private V getMapped(final Object key)
     public V put(final Object key, final Object value)
     {
         final Object val = mapNullValue(value);
-        requireNonNull(val, "Value cannot be null");
+        requireNonNull(val, "value cannot be null");
 
         final Object[] entries = this.entries;
         final int mask = entries.length - 1;
@@ -490,7 +490,7 @@ private void capacity(final int newCapacity)
         final int entriesLength = newCapacity * 2;
         if (entriesLength < 0)
         {
-            throw new IllegalStateException("Max capacity reached at size=" + size);
+            throw new IllegalStateException("max capacity reached at size=" + size);
         }
 
         /*@DoNotSub*/ resizeThreshold = (int)(newCapacity * loadFactor);

diff --git a/agrona/src/main/java/org/agrona/collections/ObjectHashSet.java b/agrona/src/main/java/org/agrona/collections/ObjectHashSet.java
@@ -191,7 +191,7 @@ private void increaseCapacity()
         final int newCapacity = values.length * 2;
         if (newCapacity < 0)
         {
-            throw new IllegalStateException("Max capacity reached at size=" + size);
+            throw new IllegalStateException("max capacity reached at size=" + size);
         }
 
         rehash(newCapacity);
@@ -481,7 +481,7 @@ public void copy(final ObjectHashSet<T> that)
     {
         if (this.values.length != that.values.length)
         {
-            throw new IllegalArgumentException("Cannot copy object: lengths not equal");
+            throw new IllegalArgumentException("cannot copy object: lengths not equal");
         }
 
         System.arraycopy(that.values, 0, this.values, 0, this.values.length);
@@ -660,7 +660,6 @@ public T next()
         /**
          * @return the next int value.
          */
-        @SuppressWarnings("unchecked")
         public T nextValue()
         {
             if (!hasNext())
@@ -675,14 +674,14 @@ public T nextValue()
             for (int i = positionCounter - 1; i >= stopCounter; i--)
             {
                 final int index = i & mask;
-                final Object value = values[index];
+                final T value = values[index];
                 if (value != MISSING_VALUE)
                 {
                     positionCounter = i;
                     isPositionValid = true;
                     --remaining;
 
-                    return (T)value;
+                    return value;
                 }
             }