From 52496bb62f33df75966de752bf75c79389790622 Mon Sep 17 00:00:00 2001 From: Looly Date: Mon, 26 Sep 2022 22:52:13 +0800 Subject: [PATCH] =?UTF-8?q?CharsetDetector=E5=A2=9E=E5=8A=A0=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E8=AF=86=E5=88=AB=E7=9A=84=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 3 ++- .../src/main/java/cn/hutool/core/io/CharsetDetector.java | 2 +- .../test/java/cn/hutool/core/io/CharsetDetectorTest.java | 9 +++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 089810afe..25d3d4193 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ ------------------------------------------------------------------------------------------------------------- -# 5.8.8.M1 (2022-09-26) +# 5.8.8 (2022-09-26) ### 🐣新特性 * 【core 】 StreamUtil.of方法新增对 Iterator 支持；StreamUtil.of(Iterable) 方法优化（pr#807@Gitee） @@ -12,6 +12,7 @@ * 【core 】 ModifierUtil和ReflectUtil增加removeFinalModify（pr#810@Gitee） * 【core 】 AbsCollValueMap添加removeValue和removeValues方法，用于list value值移除（pr#813@Gitee） * 【extra 】 hutool-extra ftp 支持上传文件或目录（pr#821@Gitee） +* 【core 】 CharsetDetector增加默认识别的长度（issue#2547@Github） ### 🐞Bug修复 * 【core 】 修复FileNameUtil.cleanInvalid无法去除换行符问题（issue#I5RMZV@Gitee） diff --git a/hutool-core/src/main/java/cn/hutool/core/io/CharsetDetector.java b/hutool-core/src/main/java/cn/hutool/core/io/CharsetDetector.java index 7353b2faa..9623bab62 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/CharsetDetector.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/CharsetDetector.java @@ -60,7 +60,7 @@ public class CharsetDetector { * @return 编码 */ public static Charset detect(InputStream in, Charset... charsets) { - return detect(IoUtil.DEFAULT_BUFFER_SIZE, in, charsets); + return detect(IoUtil.DEFAULT_LARGE_BUFFER_SIZE, in, charsets); } /** diff --git a/hutool-core/src/test/java/cn/hutool/core/io/CharsetDetectorTest.java b/hutool-core/src/test/java/cn/hutool/core/io/CharsetDetectorTest.java index 6fcb72d8e..511adb4be 100644 --- a/hutool-core/src/test/java/cn/hutool/core/io/CharsetDetectorTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/io/CharsetDetectorTest.java @@ -3,6 +3,7 @@ package cn.hutool.core.io; import cn.hutool.core.io.resource.ResourceUtil; import cn.hutool.core.util.CharsetUtil; import org.junit.Assert; +import org.junit.Ignore; import org.junit.Test; import java.nio.charset.Charset; @@ -16,4 +17,12 @@ public class CharsetDetectorTest { CharsetUtil.CHARSET_GBK, CharsetUtil.CHARSET_UTF_8); Assert.assertEquals(CharsetUtil.CHARSET_UTF_8, detect); } + + @Test + @Ignore + public void issue2547() { + final Charset detect = CharsetDetector.detect(IoUtil.DEFAULT_LARGE_BUFFER_SIZE, + ResourceUtil.getStream("d:/test/default.txt")); + Assert.assertEquals(CharsetUtil.CHARSET_UTF_8, detect); + } }