use our own ArrayUtils at more places

Author: rbri

src/main/java/org/htmlunit/html/HtmlNumberInput.java

@@ -25,6 +25,7 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.htmlunit.SgmlPage;
+import org.htmlunit.util.ArrayUtils;
 
 /**
  * Wrapper for the HTML element "input" with type is "number".
@@ -38,8 +39,8 @@
  */
 public class HtmlNumberInput extends HtmlSelectableTextInput implements LabelableElement {
 
-    private static final char[] VALID_INT_CHARS = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '-'};
-    private static final String VALID_CHARS = "0123456789-+.eE";
+    private static final char[] VALID_INT_CHARS = "0123456789-".toCharArray();
+    private static final char[] VALID_CHARS = "0123456789-+.eE".toCharArray();
 
     /**
      * Creates an instance.
@@ -82,10 +83,11 @@ public void setDefaultChecked(final boolean defaultChecked) {
     @Override
     protected void doType(final char c, final boolean lastType) {
         if (!hasFeature(JS_INPUT_NUMBER_ACCEPT_ALL)) {
-            if (VALID_CHARS.indexOf(c) == -1) {
+            if (!ArrayUtils.contains(VALID_CHARS, c)) {
                 return;
             }
         }
+
         super.doType(c, lastType);
     }
 

src/main/java/org/htmlunit/util/ArrayUtils.java

@@ -20,11 +20,17 @@
  * @author Ronald Brill
  */
 public final class ArrayUtils {
+
     /**
      * An empty immutable {@code byte} array.
      */
     public static final byte[] EMPTY_BYTE_ARRAY = {};
 
+    /**
+     * An empty immutable {@code char} array.
+     */
+    public static final char[] EMPTY_CHAR_ARRAY = {};
+
     /**
      * An empty immutable {@link String} array.
      */
@@ -60,6 +66,25 @@ public static boolean contains(final String[] strings, final String expected) {
         return false;
     }
 
+    /**
+     * @param chars the char[] to check
+     * @param expected the char that we expect
+     * @return true if at least one element of the array equals to the expected char
+     */
+    public static boolean contains(final char[] chars, final char expected) {
+        if (chars == null) {
+            return false;
+        }
+
+        for (final char c : chars) {
+            if (expected == c) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     /**
      * @param bytes the byte[] to check
      * @param expected the byte that we expect

src/test/java/org/htmlunit/util/ArrayUtilsTest.java

@@ -68,6 +68,21 @@ public void containsIgnoreCase() throws Exception {
                 () -> ArrayUtils.containsIgnoreCase(ArrayUtils.EMPTY_STRING_ARRAY, null));
     }
 
+    /**
+     * @throws Exception if the test fails
+     */
+    @Test
+    public void containsChar() throws Exception {
+        assertTrue(ArrayUtils.contains(new char[] {1}, (char) 1));
+        assertTrue(ArrayUtils.contains(new char[] {7, 1, 9}, (char) 1));
+        assertTrue(ArrayUtils.contains(new char[] {5, 2}, (char) 2));
+
+        assertFalse(ArrayUtils.contains(null, (char) 7));
+        assertFalse(ArrayUtils.contains(new char[] {}, (char) 1));
+        assertFalse(ArrayUtils.contains(ArrayUtils.EMPTY_CHAR_ARRAY, (char) 1));
+        assertFalse(ArrayUtils.contains(new char[] {7, 9}, (char) 4));
+    }
+
     /**
      * @throws Exception if the test fails
      */