diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9fe6cf93e..55d6a16c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@
* 【core 】 NumberUtil增加equals重载解决long传入判断问题（pr#2064@Github）
* 【core 】 修复CsvParser行号有误问题（pr#2065@Github）
* 【http 】 修复HttpRequest.of无法自动添加http前缀问题（issue#I4PEYL@Gitee）
+* 【core 】 修复 `CharSequenceUtil.brief(str, maxLength)` 方法字符串越界问题，以及 `maxLength` 部分值时结果与预期不符的问题（pr#2068@Github）
-------------------------------------------------------------------------------------------------------------
# 5.7.18 (2021-12-25)
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 e836c98da..38f56fbd3 100644
--- a/hutool-core/src/main/java/cn/hutool/core/text/CharSequenceUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/text/CharSequenceUtil.java
@@ -1090,7 +1090,7 @@ public class CharSequenceUtil {
/**
* 指定范围内查找指定字符
*
- * @param text 字符串
+ * @param text 字符串
* @param searchChar 被查找的字符
* @param start 起始位置，如果小于0，从0开始查找
* @param end 终止位置，如果超过str.length()则默认查找到字符串末尾
@@ -1207,9 +1207,9 @@ public class CharSequenceUtil {
* 指定范围内查找字符串
* fromIndex 为搜索起始位置，从后往前计数
*
- * @param text 字符串
+ * @param text 字符串
* @param searchStr 需要查找位置的字符串
- * @param from 起始位置，从后往前计数
+ * @param from 起始位置，从后往前计数
* @param ignoreCase 是否忽略大小写
* @return 位置
* @since 3.2.1
@@ -2015,9 +2015,9 @@ public class CharSequenceUtil {
}
if (counterOfDoubleByte % 2 != 0) {
- if(halfUp){
+ if (halfUp) {
len += 1;
- }else{
+ } else {
len -= 1;
}
}
@@ -2486,8 +2486,8 @@ public class CharSequenceUtil {
* StrUtil.repeatAndJoin("?", 5, null) = "?????"
*
*
- * @param str 被重复的字符串
- * @param count 数量
+ * @param str 被重复的字符串
+ * @param count 数量
* @param delimiter 分界符
* @return 连接后的字符串
* @since 4.0.1
@@ -3538,7 +3538,7 @@ public class CharSequenceUtil {
final int strLength = str.length();
final int searchStrLength = searchStr.length();
- if(strLength < searchStrLength){
+ if (strLength < searchStrLength) {
// issue#I4M16G@Gitee
return str(str);
}
@@ -4201,11 +4201,17 @@ public class CharSequenceUtil {
* 将给定字符串，变成 "xxx...xxx" 形式的字符串
*
*
- * - abcdef 5 -》 a...f
- * - abcdef 4 -》 a..f
- * - abcdef 3 -》 a.f
- * - abcdef 2 -》 a.
- * - abcdef 1 -》 a
+ * - abcdefgh 9 -》 abcdefgh
+ * - abcdefgh 8 -》 abcdefgh
+ * - abcdefgh 7 -》 ab...gh
+ * - abcdefgh 6 -》 ab...h
+ * - abcdefgh 5 -》 a...h
+ * - abcdefgh 4 -》 a..h
+ * - abcdefgh 3 -》 a.h
+ * - abcdefgh 2 -》 a.
+ * - abcdefgh 1 -》 a
+ * - abcdefgh 0 -》 abcdefgh
+ * - abcdefgh -1 -》 abcdefgh
*
*
* @param str 字符串
@@ -4228,14 +4234,17 @@ public class CharSequenceUtil {
case 2:
return str.charAt(0) + ".";
case 3:
- return str.charAt(0) + "." + str.charAt(str.length() - 1);
+ return str.charAt(0) + "." + str.charAt(strLength - 1);
+ case 4:
+ return str.charAt(0) + ".." + str.charAt(strLength - 1);
}
- final int w = maxLength / 2;
+ final int w2 = (maxLength - 3) / 2;
+ final int w1 = w2 + (maxLength - 3) % 2; // w2 或 w2 + 1
final String str2 = str.toString();
return format("{}...{}",
- str2.substring(0, maxLength - w),
- str2.substring(strLength - w + 3));
+ str2.substring(0, w1),
+ str2.substring(strLength - w2));
}
/**
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/StrUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/StrUtilTest.java
index e4ee3f2ca..7c3bd2be8 100644
--- a/hutool-core/src/test/java/cn/hutool/core/util/StrUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/StrUtilTest.java
@@ -529,10 +529,18 @@ public class StrUtilTest {
@Test
public void briefTest() {
- String str = RandomUtil.randomString(1000);
- int maxLength = RandomUtil.randomInt(1000);
- String brief = StrUtil.brief(str, maxLength);
- Assert.assertEquals(brief.length(), maxLength);
+ // case: 1 至 str.length - 1
+ String str = RandomUtil.randomString(RandomUtil.randomInt(1, 100));
+ for (int maxLength = 1; maxLength < str.length(); maxLength++) {
+ String brief = StrUtil.brief(str, maxLength);
+ Assert.assertEquals(brief.length(), maxLength);
+ }
+
+ // case: 不会格式化的值
+ Assert.assertEquals(str, StrUtil.brief(str, 0));
+ Assert.assertEquals(str, StrUtil.brief(str, -1));
+ Assert.assertEquals(str, StrUtil.brief(str, str.length()));
+ Assert.assertEquals(str, StrUtil.brief(str, str.length() + 1));
}
@Test
@@ -554,8 +562,21 @@ public class StrUtilTest {
@Test
public void briefTest3() {
String str = "123abc";
- int maxLength = 3;
+
+ int maxLength = 6;
String brief = StrUtil.brief(str, maxLength);
+ Assert.assertEquals(str, brief);
+
+ maxLength = 5;
+ brief = StrUtil.brief(str, maxLength);
+ Assert.assertEquals("1...c", brief);
+
+ maxLength = 4;
+ brief = StrUtil.brief(str, maxLength);
+ Assert.assertEquals("1..c", brief);
+
+ maxLength = 3;
+ brief = StrUtil.brief(str, maxLength);
Assert.assertEquals("1.c", brief);
maxLength = 2;