Reorganize grow methods

Author: Stefan Vodita

lucene/core/src/java/org/apache/lucene/util/ArrayUtil.java

@@ -335,9 +335,12 @@ public static int[] growExact(int[] array, int newLength) {
    * exponentially, but never allocating more than {@code maxLength} elements.
    */
   public static int[] growInRange(int[] array, int minLength, int maxLength) {
+    assert minLength >= 0
+        : "length must be positive (got " + minLength + "): likely integer overflow?";
     if (array.length >= minLength) {
       return array;
     }
+
     if (minLength > maxLength) {
       throw new IllegalArgumentException(
           "requested minimum array length "
@@ -347,21 +350,15 @@ public static int[] growInRange(int[] array, int minLength, int maxLength) {
     }
 
     int potentialLength = oversize(minLength, Integer.BYTES);
-    if (potentialLength > maxLength) {
-      return growExact(array, maxLength);
-    }
-    return growExact(array, potentialLength);
+    return growExact(array, Math.min(maxLength, potentialLength));
   }
 
   /**
    * Returns an array whose size is at least {@code minSize}, generally over-allocating
    * exponentially
    */
   public static int[] grow(int[] array, int minSize) {
-    assert minSize >= 0 : "size must be positive (got " + minSize + "): likely integer overflow?";
-    if (array.length < minSize) {
-      return growExact(array, oversize(minSize, Integer.BYTES));
-    } else return array;
+    return growInRange(array, minSize, Integer.MAX_VALUE);
   }
 
   /**