diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5bca495dc..0e3903c65 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,13 +2,14 @@
# 🚀Changelog
-------------------------------------------------------------------------------------------------------------
-# 5.8.30(2024-07-16)
+# 5.8.30(2024-07-18)
### 🐣新特性
* 【core 】 Converter转换规则变更，空对象、空值转为Bean时，创建默认对象，而非null（issue#3649@Github）
* 【core 】 UrlQuery增加remove方法
* 【extra 】 增加JakartaMailUtil，支持新包名的mail
* 【core 】 CharSequenceUtil增加removeAllPrefix和removeAllSuffix方法（pr#3655@Github）
+* 【core 】 CharSequenceUtil增加stripAll方法（pr#3659@Github）
### 🐞Bug修复
* 【core 】 修复因RFC3986理解有误导致的UrlPath处理冒号转义问题（issue#IAAE88@Gitee）
diff --git a/hutool-core/src/main/java/cn/hutool/core/text/CharSequenceUtil.java b/hutool-core/src/main/java/cn/hutool/core/text/CharSequenceUtil.java
index 3f723c311..82929414d 100755
--- a/hutool-core/src/main/java/cn/hutool/core/text/CharSequenceUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/text/CharSequenceUtil.java
@@ -1606,6 +1606,31 @@ public class CharSequenceUtil {
// ------------------------------------------------------------------------ strip
+ /**
+ * 去除两边的指定字符串，忽略大小写
+ *
+ * @param str 被处理的字符串
+ * @param prefixOrSuffix 前缀或后缀
+ * @return 处理后的字符串
+ * @since 3.1.2
+ */
+ public static String stripIgnoreCase(final CharSequence str, final CharSequence prefixOrSuffix) {
+ return stripIgnoreCase(str, prefixOrSuffix, prefixOrSuffix);
+ }
+
+ /**
+ * 去除两边的指定字符串，忽略大小写
+ *
+ * @param str 被处理的字符串
+ * @param prefix 前缀
+ * @param suffix 后缀
+ * @return 处理后的字符串
+ * @since 3.1.2
+ */
+ public static String stripIgnoreCase(final CharSequence str, final CharSequence prefix, final CharSequence suffix) {
+ return strip(str, prefix, suffix, true);
+ }
+
/**
* 去除两边的指定字符串
*
@@ -1623,7 +1648,20 @@ public class CharSequenceUtil {
}
/**
- * 去除两边的指定字符串
+ * 去除两边的指定字符串
+ * 两边字符如果存在，则去除，不存在不做处理
+ * {@code
+ * "aaa_STRIPPED_bbb", "a", "b" -> "aa_STRIPPED_bb"
+ * "aaa_STRIPPED_bbb", null, null -> "aaa_STRIPPED_bbb"
+ * "aaa_STRIPPED_bbb", "", "" -> "aaa_STRIPPED_bbb"
+ * "aaa_STRIPPED_bbb", "", "b" -> "aaa_STRIPPED_bb"
+ * "aaa_STRIPPED_bbb", null, "b" -> "aaa_STRIPPED_bb"
+ * "aaa_STRIPPED_bbb", "a", "" -> "aa_STRIPPED_bbb"
+ * "aaa_STRIPPED_bbb", "a", null -> "aa_STRIPPED_bbb"
+ *
+ * "a", "a", "a" -> ""
+ * }
+ *
*
* @param str 被处理的字符串
* @param prefix 前缀
@@ -1632,59 +1670,146 @@ public class CharSequenceUtil {
* @since 3.1.2
*/
public static String strip(CharSequence str, CharSequence prefix, CharSequence suffix) {
+ return strip(str, prefix, suffix, false);
+ }
+
+ /**
+ * 去除两边的指定字符串
+ * 两边字符如果存在，则去除，不存在不做处理
+ * {@code
+ * "aaa_STRIPPED_bbb", "a", "b" -> "aa_STRIPPED_bb"
+ * "aaa_STRIPPED_bbb", null, null -> "aaa_STRIPPED_bbb"
+ * "aaa_STRIPPED_bbb", "", "" -> "aaa_STRIPPED_bbb"
+ * "aaa_STRIPPED_bbb", "", "b" -> "aaa_STRIPPED_bb"
+ * "aaa_STRIPPED_bbb", null, "b" -> "aaa_STRIPPED_bb"
+ * "aaa_STRIPPED_bbb", "a", "" -> "aa_STRIPPED_bbb"
+ * "aaa_STRIPPED_bbb", "a", null -> "aa_STRIPPED_bbb"
+ *
+ * "a", "a", "a" -> ""
+ * }
+ *
+ *
+ * @param str 被处理的字符串
+ * @param prefix 前缀
+ * @param suffix 后缀
+ * @param ignoreCase 是否忽略大小写
+ * @return 处理后的字符串
+ * @since 3.1.2
+ */
+ public static String strip(CharSequence str, CharSequence prefix, CharSequence suffix, boolean ignoreCase) {
if (isEmpty(str)) {
return str(str);
}
+ final String str2 = str.toString();
int from = 0;
- int to = str.length();
+ int to = str2.length();
- String str2 = str.toString();
- if (startWith(str2, prefix)) {
+ if (startWith(str2, prefix, ignoreCase)) {
from = prefix.length();
+ if(from == to){
+ // "a", "a", "a" -> ""
+ return EMPTY;
+ }
}
- if (endWith(str2, suffix)) {
+ if (endWith(str2, suffix, ignoreCase)) {
to -= suffix.length();
+ if(from == to){
+ // "a", "a", "a" -> ""
+ return EMPTY;
+ } else if(to < from){
+ // pre去除后和suffix有重叠，如 ("aba", "ab", "ba") -> "a"
+ to += suffix.length();
+ }
}
- return str2.substring(Math.min(from, to), Math.max(from, to));
+ return str2.substring(from, to);
}
/**
- * 去除两边的指定字符串，忽略大小写
+ * 去除两边所有的指定字符串
+ *
+ * {@code
+ * "aaa_STRIPPED_bbb", "a" -> "_STRIPPED_bbb"
+ * "aaa_STRIPPED_bbb", "a", "b" -> "_STRIPPED_"
+ * "aaa_STRIPPED_bbb", "" -> "aaa_STRIPPED_bbb"
+ * }
+ *
*
* @param str 被处理的字符串
* @param prefixOrSuffix 前缀或后缀
* @return 处理后的字符串
- * @since 3.1.2
+ * @since 5.8.30
*/
- public static String stripIgnoreCase(CharSequence str, CharSequence prefixOrSuffix) {
- return stripIgnoreCase(str, prefixOrSuffix, prefixOrSuffix);
+ public static String stripAll(final CharSequence str, final CharSequence prefixOrSuffix) {
+ if (equals(str, prefixOrSuffix)) {
+ return EMPTY;
+ }
+ return stripAll(str, prefixOrSuffix, prefixOrSuffix);
}
/**
- * 去除两边的指定字符串，忽略大小写
+ * 去除两边所有的指定字符串
+ *
+ * {@code
+ * "aaa_STRIPPED_bbb", "a", "b" -> "_STRIPPED_"
+ * "aaa_STRIPPED_bbb", null, null -> "aaa_STRIPPED_bbb"
+ * "aaa_STRIPPED_bbb", "", "" -> "aaa_STRIPPED_bbb"
+ * "aaa_STRIPPED_bbb", "", "b" -> "aaa_STRIPPED_"
+ * "aaa_STRIPPED_bbb", null, "b" -> "aaa_STRIPPED_"
+ * "aaa_STRIPPED_bbb", "a", "" -> "_STRIPPED_bbb"
+ * "aaa_STRIPPED_bbb", "a", null -> "_STRIPPED_bbb"
+ *
+ * // special test
+ * "aaaaaabbb", "aaa", null -> "bbb"
+ * "aaaaaaabbb", "aa", null -> "abbb"
+ *
+ * "aaaaaaaaa", "aaa", "aa" -> ""
+ * "a", "a", "a" -> ""
+ * }
+ *
*
* @param str 被处理的字符串
* @param prefix 前缀
* @param suffix 后缀
* @return 处理后的字符串
- * @since 3.1.2
+ * @since 5.8.30
*/
- public static String stripIgnoreCase(CharSequence str, CharSequence prefix, CharSequence suffix) {
+ public static String stripAll(final CharSequence str, final CharSequence prefix, final CharSequence suffix) {
if (isEmpty(str)) {
return str(str);
}
- int from = 0;
- int to = str.length();
- String str2 = str.toString();
- if (startWithIgnoreCase(str2, prefix)) {
- from = prefix.length();
+ final String prefixStr = emptyIfNull(prefix);
+ final String suffixStr = emptyIfNull(suffix);
+
+ final String str2 = str.toString();
+ int from = 0;
+ int to = str2.length();
+
+ if(!prefixStr.isEmpty()){
+ while (str2.startsWith(prefixStr, from)) {
+ from += prefix.length();
+ if(from == to){
+ // "a", "a", "a" -> ""
+ return EMPTY;
+ }
+ }
}
- if (endWithIgnoreCase(str2, suffix)) {
- to -= suffix.length();
+ if(!suffixStr.isEmpty()){
+ while (str2.startsWith(suffixStr, to - suffixStr.length())) {
+ to -= suffixStr.length();
+ if(from == to){
+ // "a", "a", "a" -> ""
+ return EMPTY;
+ }else if(to < from){
+ // pre去除后和suffix有重叠，如 ("aba", "ab", "ba") -> "a"
+ to += suffixStr.length();
+ break;
+ }
+ }
}
+
return str2.substring(from, to);
}
diff --git a/hutool-core/src/test/java/cn/hutool/core/text/CharSequenceUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/text/CharSequenceUtilTest.java
index 0e0c4d2ed..5bd1afe10 100755
--- a/hutool-core/src/test/java/cn/hutool/core/text/CharSequenceUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/text/CharSequenceUtilTest.java
@@ -294,4 +294,89 @@ public class CharSequenceUtilTest {
result = CharSequenceUtil.removeAllSuffix(str, prefix);
assertNull(result);
}
+
+ @Test
+ public void stripIgnoreCaseTest() {
+
+ final String SOURCE_STRING = "aaa_STRIPPED_bbb";
+
+ // ---------------------------- test strip ----------------------------
+
+ // Normal test
+ assertEquals("aa_STRIPPED_bbb", CharSequenceUtil.stripIgnoreCase(SOURCE_STRING, "a"));
+ assertEquals(SOURCE_STRING, CharSequenceUtil.stripIgnoreCase(SOURCE_STRING, ""));
+ assertEquals("aa_STRIPPED_bb", CharSequenceUtil.stripIgnoreCase(SOURCE_STRING, "A", "b"));
+
+ // test null param
+ assertEquals(SOURCE_STRING, CharSequenceUtil.stripIgnoreCase(SOURCE_STRING, null, null));
+ assertEquals(SOURCE_STRING, CharSequenceUtil.stripIgnoreCase(SOURCE_STRING, "", ""));
+ assertEquals("aaa_STRIPPED_bb", CharSequenceUtil.stripIgnoreCase(SOURCE_STRING, "", "B"));
+ assertEquals("aaa_STRIPPED_bb", CharSequenceUtil.stripIgnoreCase(SOURCE_STRING, null, "b"));
+ assertEquals("aa_STRIPPED_bbb", CharSequenceUtil.stripIgnoreCase(SOURCE_STRING, "a", ""));
+ assertEquals("aa_STRIPPED_bbb", CharSequenceUtil.stripIgnoreCase(SOURCE_STRING, "a", null));
+ // 本次提交前无法通过的 case
+ assertEquals("", CharSequenceUtil.stripIgnoreCase("a", "a", "a"));
+
+ // 前缀后缀有重叠，优先去掉前缀
+ assertEquals("a", CharSequenceUtil.stripIgnoreCase("aba", "aB", "bB"));
+ }
+
+ @Test
+ public void stripTest() {
+
+ final String SOURCE_STRING = "aaa_STRIPPED_bbb";
+
+ // ---------------------------- test strip ----------------------------
+
+ // Normal test
+ assertEquals("aa_STRIPPED_bbb", CharSequenceUtil.strip(SOURCE_STRING, "a"));
+ assertEquals(SOURCE_STRING, CharSequenceUtil.strip(SOURCE_STRING, ""));
+ assertEquals("aa_STRIPPED_bb", CharSequenceUtil.strip(SOURCE_STRING, "a", "b"));
+
+ // test null param
+ assertEquals(SOURCE_STRING, CharSequenceUtil.strip(SOURCE_STRING, null, null));
+ assertEquals(SOURCE_STRING, CharSequenceUtil.strip(SOURCE_STRING, "", ""));
+ assertEquals("aaa_STRIPPED_bb", CharSequenceUtil.strip(SOURCE_STRING, "", "b"));
+ assertEquals("aaa_STRIPPED_bb", CharSequenceUtil.strip(SOURCE_STRING, null, "b"));
+ assertEquals("aa_STRIPPED_bbb", CharSequenceUtil.strip(SOURCE_STRING, "a", ""));
+ assertEquals("aa_STRIPPED_bbb", CharSequenceUtil.strip(SOURCE_STRING, "a", null));
+ // 本次提交前无法通过的 case
+ assertEquals("", CharSequenceUtil.strip("a", "a", "a"));
+
+ // 前缀后缀有重叠，优先去掉前缀
+ assertEquals("a", CharSequenceUtil.strip("aba", "ab", "ba"));
+ }
+
+ @Test
+ public void stripAllTest() {
+ final String SOURCE_STRING = "aaa_STRIPPED_bbb";
+
+ // ---------------------------- test stripAll ----------------------------
+
+ // Normal test
+ assertEquals("_STRIPPED_bbb", CharSequenceUtil.stripAll(SOURCE_STRING, "a"));
+ assertEquals(SOURCE_STRING, CharSequenceUtil.stripAll(SOURCE_STRING, ""));
+
+ // test null param
+ assertEquals("_STRIPPED_", CharSequenceUtil.stripAll(SOURCE_STRING, "a", "b"));
+ assertEquals(SOURCE_STRING, CharSequenceUtil.stripAll(SOURCE_STRING, null, null));
+ assertEquals(SOURCE_STRING, CharSequenceUtil.stripAll(SOURCE_STRING, "", ""));
+ assertEquals("aaa_STRIPPED_", CharSequenceUtil.stripAll(SOURCE_STRING, "", "b"));
+ assertEquals("aaa_STRIPPED_", CharSequenceUtil.stripAll(SOURCE_STRING, null, "b"));
+ assertEquals("_STRIPPED_bbb", CharSequenceUtil.stripAll(SOURCE_STRING, "a", ""));
+ assertEquals("_STRIPPED_bbb", CharSequenceUtil.stripAll(SOURCE_STRING, "a", null));
+
+ // special test
+ assertEquals("bbb", CharSequenceUtil.stripAll("aaaaaabbb", "aaa", null));
+ assertEquals("abbb", CharSequenceUtil.stripAll("aaaaaaabbb", "aa", null));
+
+ // aaaaaaaaa (9个a) 可以被看为 aaa_aaaa_aa
+ assertEquals("", CharSequenceUtil.stripAll("aaaaaaaaa", "aaa", "aa"));
+ // 第二次迭代后会出现 from 比 to 大的情况，原本代码是强行交换，但是回导致无法去除前后缀
+ assertEquals("", CharSequenceUtil.stripAll("a", "a", "a"));
+
+ // 前缀后缀有重叠，优先去掉前缀
+ assertEquals("a", CharSequenceUtil.stripAll("aba", "ab", "ba"));
+ assertEquals("a", CharSequenceUtil.stripAll("abababa", "ab", "ba"));
+ }
}