ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-05-09 23:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

CharSequenceUtil增加stripAll方法（pr#3659@Github）

Browse Source
This commit is contained in:
Looly 2024-07-18 11:42:37 +08:00
parent d8fe4daf6d
commit bbbe8d069f
2 changed files with 80 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
hutool-core/src/main/java/org/dromara/hutool/core/text/CharSequenceUtil.java
View File

@ -1388,6 +1388,31 @@ public class CharSequenceUtil extends StrValidator {
// region ----- strip // region ----- 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);
}
/** /**
* 去除两边的指定字符串 * 去除两边的指定字符串
* <pre>{@code * <pre>{@code
@ -1432,6 +1457,33 @@ public class CharSequenceUtil extends StrValidator {
* @since 3.1.2 * @since 3.1.2
*/ */
public static String strip(final CharSequence str, final CharSequence prefix, final CharSequence suffix) { public static String strip(final CharSequence str, final CharSequence prefix, final CharSequence suffix) {
return strip(str, prefix, suffix, false);
}
/**
* 去除两边的指定字符串<br>
* 两边字符如果存在，则去除，不存在不做处理
* <pre>{@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" -> ""
* }
* </pre>
*
* @param str 被处理的字符串
* @param prefix 前缀
* @param suffix 后缀
* @param ignoreCase 是否忽略大小写
* @return 处理后的字符串
* @since 3.1.2
*/
public static String strip(final CharSequence str, final CharSequence prefix, final CharSequence suffix, final boolean ignoreCase) {
if (isEmpty(str)) { if (isEmpty(str)) {
return toStringOrNull(str); return toStringOrNull(str);
} }
@ -1440,14 +1492,14 @@ public class CharSequenceUtil extends StrValidator {
int from = 0; int from = 0;
int to = str2.length(); int to = str2.length();
if (startWith(str2, prefix)) { if (startWith(str2, prefix, ignoreCase)) {
from = prefix.length(); from = prefix.length();
if(from == to){ if(from == to){
// "a", "a", "a" -> "" // "a", "a", "a" -> ""
return EMPTY; return EMPTY;
} }
} }
if (endWith(str2, suffix)) { if (endWith(str2, suffix, ignoreCase)) {
to -= suffix.length(); to -= suffix.length();
if(from == to){ if(from == to){
// "a", "a", "a" -> "" // "a", "a", "a" -> ""
@ -1547,44 +1599,6 @@ public class CharSequenceUtil extends StrValidator {
return str2.substring(from, to); return str2.substring(from, to);
} }
/**
* 去除两边的指定字符串，忽略大小写
*
* @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) {
if (isEmpty(str)) {
return toStringOrNull(str);
}
int from = 0;
int to = str.length();
final String str2 = str.toString();
if (startWithIgnoreCase(str2, prefix)) {
from = prefix.length();
}
if (endWithIgnoreCase(str2, suffix)) {
to -= suffix.length();
}
return str2.substring(from, to);
}
// endregion // endregion
// region ----- add // region ----- add

26
hutool-core/src/test/java/org/dromara/hutool/core/text/CharSequenceUtilTest.java
View File

@ -451,6 +451,32 @@ public class CharSequenceUtilTest {
assertNull(result); 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 @Test
public void stripTest() { public void stripTest() {