lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2025-04-24 18:04:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly 2023-03-29 13:57:17 +08:00
parent 27e1f5f61e
commit bb1d65ff97
4 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
hutool-core/src/main/java/cn/hutool/core/io/ByteOrderMark.java
View File

@ -6,7 +6,6 @@ import cn.hutool.core.util.CharsetUtil;
import java.io.Serializable;
import java.util.Arrays;
import java.util.Locale;
import java.util.function.Predicate;
/**
@ -31,27 +30,32 @@ public class ByteOrderMark implements Predicate<byte[]>, Comparable<ByteOrderMar
/**
* UTF-8 BOM.
*/
public static final ByteOrderMark UTF_8 = new ByteOrderMark(CharsetUtil.NAME_UTF_8, 0xEF, 0xBB, 0xBF);
public static final ByteOrderMark UTF_8 = new ByteOrderMark(CharsetUtil.NAME_UTF_8,
(byte) 0xEF, (byte) 0xBB, (byte) 0xBF);
/**
* UTF-16BE BOM (Big-Endian).
*/
public static final ByteOrderMark UTF_16BE = new ByteOrderMark("UTF-16BE", 0xFE, 0xFF);
public static final ByteOrderMark UTF_16BE = new ByteOrderMark("UTF-16BE",
(byte) 0xFE, (byte) 0xFF);
/**
* UTF-16LE BOM (Little-Endian).
*/
public static final ByteOrderMark UTF_16LE = new ByteOrderMark("UTF-16LE", 0xFF, 0xFE);
public static final ByteOrderMark UTF_16LE = new ByteOrderMark("UTF-16LE",
(byte) 0xFF, (byte) 0xFE);
/**
* UTF-32BE BOM (Big-Endian).
*/
public static final ByteOrderMark UTF_32BE = new ByteOrderMark("UTF-32BE", 0x00, 0x00, 0xFE, 0xFF);
public static final ByteOrderMark UTF_32BE = new ByteOrderMark("UTF-32BE",
(byte) 0x00, (byte) 0x00, (byte) 0xFE, (byte) 0xFF);
/**
* UTF-32LE BOM (Little-Endian).
*/
public static final ByteOrderMark UTF_32LE = new ByteOrderMark("UTF-32LE", 0xFF, 0xFE, 0x00, 0x00);
public static final ByteOrderMark UTF_32LE = new ByteOrderMark("UTF-32LE",
(byte) 0xFF, (byte) 0xFE, (byte) 0x00, (byte) 0x00);
/**
* 预定义的所有BOM信息
@ -66,7 +70,7 @@ public class ByteOrderMark implements Predicate<byte[]>, Comparable<ByteOrderMar
// endregion
private final String charsetName;
private final int[] bytes;
private final byte[] bytes;
/**
* 构造
@ -75,12 +79,12 @@ public class ByteOrderMark implements Predicate<byte[]>, Comparable<ByteOrderMar
* @param bytes BOM bytes
* @throws IllegalArgumentException 编码名称为空或者bytes为空
*/
public ByteOrderMark(final String charsetName, final int... bytes) {
public ByteOrderMark(final String charsetName, final byte... bytes) {
if (ArrayUtil.isEmpty(bytes)) {
throw new IllegalArgumentException("No bytes specified");
}
this.charsetName = Assert.notEmpty(charsetName, "No charsetName specified");
this.bytes = new int[bytes.length];
this.bytes = new byte[bytes.length];
System.arraycopy(bytes, 0, this.bytes, 0, bytes.length);
}
@ -118,11 +122,7 @@ public class ByteOrderMark implements Predicate<byte[]>, Comparable<ByteOrderMar
* @return a copy of the BOM's bytes
*/
public byte[] getBytes() {
final byte[] copy = new byte[bytes.length];
for (int i = 0; i < bytes.length; i++) {
copy[i] = (byte) bytes[i];
}
return copy;
return Arrays.copyOfRange(bytes, 0, bytes.length);
}
/**
@ -175,7 +175,7 @@ public class ByteOrderMark implements Predicate<byte[]>, Comparable<ByteOrderMar
builder.append(",");
}
builder.append("0x");
builder.append(Integer.toHexString(0xFF & bytes[i]).toUpperCase(Locale.ROOT));
builder.append(Integer.toHexString(0xFF & bytes[i]).toUpperCase());
}
builder.append(']');
return builder.toString();

3
hutool-core/src/main/java/cn/hutool/core/io/stream/BOMInputStream.java
View File

@ -12,8 +12,11 @@
package cn.hutool.core.io.stream;
import cn.hutool.core.codec.HexUtil;
import cn.hutool.core.io.ByteOrderMark;
import cn.hutool.core.io.IORuntimeException;
import cn.hutool.core.lang.Console;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.CharsetUtil;
import java.io.IOException;

14
hutool-core/src/test/java/cn/hutool/core/io/BomReaderTest.java Executable file
View File

@ -0,0 +1,14 @@
package cn.hutool.core.io;
import cn.hutool.core.io.file.FileUtil;
import org.junit.Assert;
import org.junit.Test;
public class BomReaderTest {
@Test
public void readTest() {
final BomReader bomReader = FileUtil.getBOMReader(FileUtil.file("with_bom.txt"));
final String read = IoUtil.read(bomReader, true);
Assert.assertEquals("此文本包含BOM头信息，用于测试BOM头读取", read);
}
}

1
hutool-core/src/test/resources/with_bom.txt Executable file
View File

@ -0,0 +1 @@
此文本包含BOM头信息，用于测试BOM头读取