Resolved shekhargulati#66

shekhargulati · shekhargulati · commit 61ca9fc9842a · 2016-08-24T15:32:45.000+05:30
diff --git a/src/main/java/strman/Strman.java b/src/main/java/strman/Strman.java
@@ -1236,7 +1236,7 @@ public static Optional<String> trimStart(final String input) {
 
 
     /**
-     * Removes leading whitespace from string.
+     * Removes leading characters from string.
      *
      * @param input The string to trim.
      * @param chars The characters to trim.
@@ -1252,6 +1252,36 @@ public static Optional<String> trimStart(final String input, String... chars) {
                 });
     }
 
+    /**
+     * Removes trailing whitespace from string.
+     *
+     * @param input The string to trim.
+     * @return Returns the trimmed string.
+     */
+    public static Optional<String> trimEnd(final String input) {
+        return Optional.ofNullable(input)
+                .filter(v -> !v.isEmpty())
+                .map(Strman::rightTrim);
+    }
+
+
+    /**
+     * Removes trailing characters from string.
+     *
+     * @param input The string to trim.
+     * @param chars The characters to trim.
+     *
+     * @return Returns the trimmed string.
+     */
+    public static Optional<String> trimEnd(final String input, String... chars) {
+        return Optional.ofNullable(input)
+                .filter(v -> !v.isEmpty())
+                .map(v -> {
+                    String pattern = String.format("[%s]+$", join(chars, "\\"));
+                    return v.replaceAll(pattern, "");
+                });
+    }
+
 
     private static void validate(String value, Predicate<String> predicate, final Supplier<String> supplier) {
         if (predicate.test(value)) {
diff --git a/src/test/java/strman/StrmanTest.java b/src/test/java/strman/StrmanTest.java
@@ -974,4 +974,20 @@ public void trimStart_shouldRemoveSpecialCharactersAtStart() throws Exception {
         assertThat(trimStart("-_-!abc-_-", "_", "-", "!"), is(Optional.of("abc-_-")));
         assertThat(trimStart("-_-#abc-_-", "_", "-", "!", "#"), is(Optional.of("abc-_-")));
     }
+
+    @Test
+    public void trimEnd_shouldRemoveAllTrailingWhitespace() throws Exception {
+        assertThat(trimEnd("   abc   "), is(Optional.of("   abc")));
+        assertThat(trimEnd("abc   "), is(Optional.of("abc")));
+        assertThat(trimEnd("abc"), is(Optional.of("abc")));
+        assertThat(trimEnd(""), is(Optional.empty()));
+        assertThat(trimEnd(null), is(Optional.empty()));
+    }
+
+    @Test
+    public void trimEnd_shouldRemoveAllTrailingSpecialCharacters() throws Exception {
+        assertThat(trimEnd("-_-abc-_-", "_", "-"), is(Optional.of("-_-abc")));
+        assertThat(trimEnd("-_-abc!-_-", "_", "-", "!"), is(Optional.of("-_-abc")));
+        assertThat(trimEnd("-_-abc#-_-", "_", "-", "!", "#"), is(Optional.of("-_-abc")));
+    }
 }
