use our own StringUtils at more places

Author: rbri

src/main/java/org/htmlunit/DefaultPageCreator.java

@@ -20,7 +20,6 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Locale;
 
-import org.apache.commons.lang3.ArrayUtils;
 import org.htmlunit.html.DomElement;
 import org.htmlunit.html.Html;
 import org.htmlunit.html.HtmlPage;
@@ -281,7 +280,10 @@ private static byte[] read(final InputStream stream, final int maxNb) throws IOE
         if (nbRead == buffer.length) {
             return buffer;
         }
-        return ArrayUtils.subarray(buffer, 0, nbRead);
+
+        final byte[] result = new byte[nbRead];
+        System.arraycopy(buffer, 0, result, 0, nbRead);
+        return result;
     }
 
     /**

src/main/java/org/htmlunit/html/serializer/HtmlSerializerNormalizedText.java

@@ -20,7 +20,6 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.commons.lang3.StringUtils;
 import org.htmlunit.Page;
 import org.htmlunit.SgmlPage;
 import org.htmlunit.WebWindow;
@@ -61,6 +60,7 @@
 import org.htmlunit.html.HtmlUnorderedList;
 import org.htmlunit.html.TableRowGroup;
 import org.htmlunit.html.serializer.HtmlSerializerNormalizedText.HtmlSerializerTextBuilder.Mode;
+import org.htmlunit.util.StringUtils;
 
 /**
  * Utility to handle conversion from HTML code to string.
@@ -634,7 +634,7 @@ public void append(final String content, final Mode mode) {
 
             String text = content;
             if (mode == Mode.PRESERVE_BLANK_NEWLINE) {
-                text = StringUtils.stripEnd(text, null);
+                text = StringUtils.trimRight(text);
             }
 
             boolean crFound = false;

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

@@ -915,4 +915,30 @@ public static float toFloat(final String str, final float defaultValue) {
             return defaultValue;
         }
     }
+
+    /**
+     * Strips any whitespace from the end of a String.
+     * <p>
+     * A {@code null} input String returns {@code null}. An empty string ("") input returns the empty string.
+     * </p>
+     *
+     * @param str the String to remove characters from, may be null.
+     * @return the stripped String, {@code null} if null String input.
+     */
+    public static String trimRight(final String str) {
+        if (isEmptyOrNull(str)) {
+            return str;
+        }
+
+        int end = str.length();
+        while (end != 0 && Character.isWhitespace(str.charAt(end - 1))) {
+            end--;
+        }
+
+        if (end == str.length()) {
+            return str;
+        }
+
+        return str.substring(0, end);
+    }
 }

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

@@ -556,4 +556,19 @@ public void substringAfter() throws Exception {
         assertEquals("", StringUtils.substringAfter("abc", "c"));
         assertEquals("", StringUtils.substringAfter("abc", "d"));
     }
+
+    /**
+     * @throws Exception if the test fails
+     */
+    @Test
+    public void trimRight() throws Exception {
+        assertNull(StringUtils.trimRight(null));
+        assertEquals(StringUtils.EMPTY_STRING, StringUtils.trimRight(""));
+        assertEquals("", StringUtils.trimRight(StringUtils.EMPTY_STRING));
+
+        assertEquals("abc", StringUtils.trimRight("abc"));
+        assertEquals("  abc", StringUtils.trimRight("  abc"));
+        assertEquals("abc", StringUtils.trimRight("abc  "));
+        assertEquals(" a b c", StringUtils.trimRight(" a b c "));
+    }
 }