ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-04-19 03:01:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复DataSize.parse(size)不支持空格问题

Browse Source
This commit is contained in:
Looly 2023-10-18 14:42:16 +08:00
parent 3ce8b1dc0b
commit d5c6a6d217
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hutool-core/src/main/java/org/dromara/hutool/core/io/unit/DataSize.java
View File

@ -197,7 +197,7 @@ public final class DataSize implements Comparable<DataSize> {
public static DataSize parse(final CharSequence text, final DataUnit defaultUnit) { public static DataSize parse(final CharSequence text, final DataUnit defaultUnit) {
Assert.notNull(text, "Text must not be null"); Assert.notNull(text, "Text must not be null");
try { try {
final Matcher matcher = PATTERN.matcher(text); final Matcher matcher = PATTERN.matcher(StrUtil.cleanBlank(text));
Assert.state(matcher.matches(), "Does not match data size pattern"); Assert.state(matcher.matches(), "Does not match data size pattern");
final DataUnit unit = determineDataUnit(matcher.group(3), defaultUnit); final DataUnit unit = determineDataUnit(matcher.group(3), defaultUnit);

7
hutool-core/src/test/java/org/dromara/hutool/core/io/unit/DataSizeUtilTest.java
View File

@ -72,4 +72,11 @@ public class DataSizeUtilTest {
format = DataSizeUtil.format(1024L * 1024 * 1024 * 1024); format = DataSizeUtil.format(1024L * 1024 * 1024 * 1024);
Assertions.assertEquals("1 TB", format); Assertions.assertEquals("1 TB", format);
} }
@Test
void issueI88Z4ZTest() {
final String size = DataSizeUtil.format(10240000);
final long bytes = DataSize.parse(size).toBytes();
Assertions.assertEquals(10244587, bytes);
}
} }