use our own StringUtils at more places

Author: rbri

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

@@ -23,9 +23,9 @@
 import java.util.Locale;
 import java.util.Map;
 
-import org.apache.commons.lang3.StringUtils;
 import org.htmlunit.SgmlPage;
 import org.htmlunit.util.ArrayUtils;
+import org.htmlunit.util.StringUtils;
 
 /**
  * Wrapper for the HTML element "input" with type is "number".

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

@@ -941,4 +941,36 @@ public static String trimRight(final String str) {
 
         return str.substring(0, end);
     }
+
+    /**
+     * @param cs the String to check, may be null.
+     * @param valid an array of valid chars, may be null.
+     * @return true if it only contains valid chars and is non-null.
+     */
+    public static boolean containsOnly(final CharSequence cs, final char... valid) {
+        if (valid == null || valid.length == 0) {
+            throw new IllegalArgumentException("Expected valid char[] can't be null or empty");
+        }
+        if (isEmptyOrNull(cs)) {
+            return false;
+        }
+
+        final int csLength = cs.length();
+        final int validLength = valid.length;
+        for (int i = 0; i < csLength; i++) {
+            final char testChar = cs.charAt(i);
+            int j = 0;
+            for ( ; j < validLength; j++) {
+                final char validChar = valid[j];
+                if (validChar == testChar) {
+                    break;
+                }
+            }
+            if (j == validLength) {
+                return false;
+            }
+        }
+
+        return true;
+    }
 }

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

@@ -201,6 +201,30 @@ public void containsIgnoreCase() throws Exception {
         Assertions.assertThrows(IllegalArgumentException.class, () -> StringUtils.containsIgnoreCase("", ""));
     }
 
+
+    /**
+     * @throws Exception if the test fails
+     */
+    @Test
+    public void containsOnly() {
+        assertFalse(StringUtils.containsOnly(null, "x".toCharArray()));
+        assertFalse(StringUtils.containsOnly("", "x".toCharArray()));
+        assertFalse(StringUtils.containsOnly("a", "x".toCharArray()));
+        assertFalse(StringUtils.containsOnly("ax", "x".toCharArray()));
+        assertFalse(StringUtils.containsOnly("xa", "x".toCharArray()));
+
+        assertTrue(StringUtils.containsOnly("x", "ax".toCharArray()));
+        assertTrue(StringUtils.containsOnly("aa", "ax".toCharArray()));
+        assertTrue(StringUtils.containsOnly("ax", "ax".toCharArray()));
+        assertTrue(StringUtils.containsOnly("axaaa", "ax".toCharArray()));
+        assertTrue(StringUtils.containsOnly("xaaxxxaa", "xa".toCharArray()));
+
+        Assertions.assertThrows(IllegalArgumentException.class, () -> StringUtils.containsOnly("AB", null));
+        Assertions.assertThrows(IllegalArgumentException.class,
+                () -> StringUtils.containsOnly("AB", ArrayUtils.EMPTY_CHAR_ARRAY));
+    }
+
+
     /**
      * @throws Exception if the test fails
      */