zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly
2022-05-07 13:24:02 +08:00
parent 029a603d5f
commit 36d75d7030
81 changed files with 525 additions and 494 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelWriter.java
View File

@@ -1017,7 +1017,7 @@ public class ExcelWriter extends ExcelBase<ExcelWriter> {
}
} else if (rowBean instanceof Hyperlink) {
// Hyperlink当成一个值
return writeRow(ListUtil.toList(rowBean), isWriteKeyAsHead);
return writeRow(ListUtil.of(rowBean), isWriteKeyAsHead);
} else if (BeanUtil.isBean(rowBean.getClass())) {
if (MapUtil.isEmpty(this.headerAlias)) {
rowMap = BeanUtil.beanToMap(rowBean, new LinkedHashMap<>(), false, false);
@@ -1027,7 +1027,7 @@ public class ExcelWriter extends ExcelBase<ExcelWriter> {
}
} else {
// 其它转为字符串默认输出
return writeRow(ListUtil.toList(rowBean), isWriteKeyAsHead);
return writeRow(ListUtil.of(rowBean), isWriteKeyAsHead);
}
return writeRow(rowMap, isWriteKeyAsHead);
}

2
hutool-poi/src/main/java/cn/hutool/poi/excel/sax/SheetRidReader.java
View File

@@ -157,7 +157,7 @@ public class SheetRidReader extends DefaultHandler {
* @since 5.7.17
*/
public List<String> getSheetNames() {
return ListUtil.toList(this.NAME_RID_MAP.keySet());
return ListUtil.of(this.NAME_RID_MAP.keySet());
}
@Override

2
hutool-poi/src/main/java/cn/hutool/poi/excel/sax/handler/BeanRowHandler.java
View File

@@ -44,7 +44,7 @@ public abstract class BeanRowHandler<T> extends AbstractRowHandler<T> {
@Override
public void handle(final int sheetIndex, final long rowIndex, final List<Object> rowCells) {
if (rowIndex == this.headerRowIndex) {
this.headerList = ListUtil.unmodifiable(Convert.toList(String.class, rowCells));
this.headerList = ListUtil.view(Convert.toList(String.class, rowCells));
return;
}
super.handle(sheetIndex, rowIndex, rowCells);

2
hutool-poi/src/main/java/cn/hutool/poi/excel/sax/handler/MapRowHandler.java
View File

@@ -41,7 +41,7 @@ public abstract class MapRowHandler extends AbstractRowHandler<Map<String, Objec
@Override
public void handle(final int sheetIndex, final long rowIndex, final List<Object> rowCells) {
if (rowIndex == this.headerRowIndex) {
this.headerList = ListUtil.unmodifiable(Convert.toList(String.class, rowCells));
this.headerList = ListUtil.view(Convert.toList(String.class, rowCells));
return;
}
super.handle(sheetIndex, rowIndex, rowCells);

2
hutool-poi/src/main/java/cn/hutool/poi/word/TableUtil.java
View File

@@ -94,7 +94,7 @@ public class TableUtil {
rowMap = BeanUtil.beanToMap(rowBean, new LinkedHashMap<>(), false, false);
} else {
// 其它转为字符串默认输出
writeRow(row, ListUtil.toList(rowBean), isWriteKeyAsHead);
writeRow(row, ListUtil.of(rowBean), isWriteKeyAsHead);
return;
}

2
hutool-poi/src/test/java/cn/hutool/poi/csv/CsvUtilTest.java
View File

@@ -177,7 +177,7 @@ public class CsvUtilTest {
String mobile;
}
final List<String> header = ListUtil.of("用户id", "用户名", "手机号");
final List<String> header = ListUtil.view("用户id", "用户名", "手机号");
final List<CsvRow> row = new ArrayList<>();
final List<User> datas = new ArrayList<>();

30
hutool-poi/src/test/java/cn/hutool/poi/excel/BigExcelWriteTest.java
View File

@@ -30,7 +30,7 @@ public class BigExcelWriteTest {
@Test
@Ignore
public void writeTest2() {
final List<String> row = ListUtil.toList("姓名", "加班日期", "下班时间", "加班时长", "餐补", "车补次数", "车补", "总计");
final List<String> row = ListUtil.of("姓名", "加班日期", "下班时间", "加班时长", "餐补", "车补次数", "车补", "总计");
final BigExcelWriter overtimeWriter = ExcelUtil.getBigWriter("e:/excel/single_line.xlsx");
overtimeWriter.write(row);
overtimeWriter.close();
@@ -39,13 +39,13 @@ public class BigExcelWriteTest {
@Test
@Ignore
public void writeTest() {
final List<?> row1 = ListUtil.toList("aaaaa", "bb", "cc", "dd", DateUtil.date(), 3.22676575765);
final List<?> row2 = ListUtil.toList("aa1", "bb1", "cc1", "dd1", DateUtil.date(), 250.7676);
final List<?> row3 = ListUtil.toList("aa2", "bb2", "cc2", "dd2", DateUtil.date(), 0.111);
final List<?> row4 = ListUtil.toList("aa3", "bb3", "cc3", "dd3", DateUtil.date(), 35);
final List<?> row5 = ListUtil.toList("aa4", "bb4", "cc4", "dd4", DateUtil.date(), 28.00);
final List<?> row1 = ListUtil.of("aaaaa", "bb", "cc", "dd", DateUtil.date(), 3.22676575765);
final List<?> row2 = ListUtil.of("aa1", "bb1", "cc1", "dd1", DateUtil.date(), 250.7676);
final List<?> row3 = ListUtil.of("aa2", "bb2", "cc2", "dd2", DateUtil.date(), 0.111);
final List<?> row4 = ListUtil.of("aa3", "bb3", "cc3", "dd3", DateUtil.date(), 35);
final List<?> row5 = ListUtil.of("aa4", "bb4", "cc4", "dd4", DateUtil.date(), 28.00);
final List<List<?>> rows = ListUtil.toList(row1, row2, row3, row4, row5);
final List<List<?>> rows = ListUtil.of(row1, row2, row3, row4, row5);
for(int i=0; i < 400000; i++) {
//超大列表写出测试
rows.add(ObjUtil.clone(row1));
@@ -70,13 +70,13 @@ public class BigExcelWriteTest {
@Test
@Ignore
public void mergeTest() {
final List<?> row1 = ListUtil.toList("aa", "bb", "cc", "dd", DateUtil.date(), 3.22676575765);
final List<?> row2 = ListUtil.toList("aa1", "bb1", "cc1", "dd1", DateUtil.date(), 250.7676);
final List<?> row3 = ListUtil.toList("aa2", "bb2", "cc2", "dd2", DateUtil.date(), 0.111);
final List<?> row4 = ListUtil.toList("aa3", "bb3", "cc3", "dd3", DateUtil.date(), 35);
final List<?> row5 = ListUtil.toList("aa4", "bb4", "cc4", "dd4", DateUtil.date(), 28.00);
final List<?> row1 = ListUtil.of("aa", "bb", "cc", "dd", DateUtil.date(), 3.22676575765);
final List<?> row2 = ListUtil.of("aa1", "bb1", "cc1", "dd1", DateUtil.date(), 250.7676);
final List<?> row3 = ListUtil.of("aa2", "bb2", "cc2", "dd2", DateUtil.date(), 0.111);
final List<?> row4 = ListUtil.of("aa3", "bb3", "cc3", "dd3", DateUtil.date(), 35);
final List<?> row5 = ListUtil.of("aa4", "bb4", "cc4", "dd4", DateUtil.date(), 28.00);
final List<List<?>> rows = ListUtil.toList(row1, row2, row3, row4, row5);
final List<List<?>> rows = ListUtil.of(row1, row2, row3, row4, row5);
// 通过工具类创建writer
final BigExcelWriter writer = ExcelUtil.getBigWriter("e:/mergeTest.xlsx");
@@ -114,7 +114,7 @@ public class BigExcelWriteTest {
row2.put("是否合格", false);
row2.put("考试日期", DateUtil.date());
final ArrayList<Map<String, Object>> rows = ListUtil.toList(row1, row2);
final ArrayList<Map<String, Object>> rows = ListUtil.of(row1, row2);
// 通过工具类创建writer
final String path = "e:/bigWriteMapTest.xlsx";
@@ -174,7 +174,7 @@ public class BigExcelWriteTest {
bean2.setScore(38.50);
bean2.setExamDate(DateUtil.date());
final List<cn.hutool.poi.excel.TestBean> rows = ListUtil.toList(bean1, bean2);
final List<cn.hutool.poi.excel.TestBean> rows = ListUtil.of(bean1, bean2);
// 通过工具类创建writer
final String file = "e:/bigWriteBeanTest.xlsx";
FileUtil.del(file);

98
hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelWriteTest.java
View File

@@ -46,12 +46,12 @@ public class ExcelWriteTest {
@Test
public void writeNoFlushTest(){
final List<?> row1 = ListUtil.toList("aaaaa", "bb", "cc", "dd", DateUtil.date(), 3.22676575765);
final List<?> row2 = ListUtil.toList("aa1", "bb1", "cc1", "dd1", DateUtil.date(), 250.7676);
final List<?> row3 = ListUtil.toList("aa2", "bb2", "cc2", "dd2", DateUtil.date(), 0.111);
final List<?> row4 = ListUtil.toList("aa3", "bb3", "cc3", "dd3", DateUtil.date(), 35);
final List<?> row5 = ListUtil.toList("aa4", "bb4", "cc4", "dd4", DateUtil.date(), 28.00);
final List<List<?>> rows = ListUtil.toList(row1, row2, row3, row4, row5);
final List<?> row1 = ListUtil.of("aaaaa", "bb", "cc", "dd", DateUtil.date(), 3.22676575765);
final List<?> row2 = ListUtil.of("aa1", "bb1", "cc1", "dd1", DateUtil.date(), 250.7676);
final List<?> row3 = ListUtil.of("aa2", "bb2", "cc2", "dd2", DateUtil.date(), 0.111);
final List<?> row4 = ListUtil.of("aa3", "bb3", "cc3", "dd3", DateUtil.date(), 35);
final List<?> row5 = ListUtil.of("aa4", "bb4", "cc4", "dd4", DateUtil.date(), 28.00);
final List<List<?>> rows = ListUtil.of(row1, row2, row3, row4, row5);
final ExcelWriter writer = ExcelUtil.getWriter();
writer.write(rows);
@@ -61,13 +61,13 @@ public class ExcelWriteTest {
@Test
@Ignore
public void testRowOrColumnCellStyle() {
final List<?> row1 = ListUtil.toList("aaaaa", "bb", "cc", "dd", DateUtil.date(), 3.22676575765);
final List<?> row2 = ListUtil.toList("aa1", "bb1", "cc1", "dd1", DateUtil.date(), 250.7676);
final List<?> row3 = ListUtil.toList("aa2", "bb2", "cc2", "dd2", DateUtil.date(), 0.111);
final List<?> row4 = ListUtil.toList("aa3", "bb3", "cc3", "dd3", DateUtil.date(), 35);
final List<?> row5 = ListUtil.toList("aa4", "bb4", "cc4", "dd4", DateUtil.date(), 28.00);
final List<?> row1 = ListUtil.of("aaaaa", "bb", "cc", "dd", DateUtil.date(), 3.22676575765);
final List<?> row2 = ListUtil.of("aa1", "bb1", "cc1", "dd1", DateUtil.date(), 250.7676);
final List<?> row3 = ListUtil.of("aa2", "bb2", "cc2", "dd2", DateUtil.date(), 0.111);
final List<?> row4 = ListUtil.of("aa3", "bb3", "cc3", "dd3", DateUtil.date(), 35);
final List<?> row5 = ListUtil.of("aa4", "bb4", "cc4", "dd4", DateUtil.date(), 28.00);
final List<List<?>> rows = ListUtil.toList(row1, row2, row3, row4, row5);
final List<List<?>> rows = ListUtil.of(row1, row2, row3, row4, row5);
final BigExcelWriter overtimeWriter = ExcelUtil.getBigWriter("d:/test/style_line.xlsx");
overtimeWriter.write(rows, true);
@@ -105,7 +105,7 @@ public class ExcelWriteTest {
@Test
@Ignore
public void writeTest2() {
final List<String> row = ListUtil.toList("姓名", "加班日期", "下班时间", "加班时长", "餐补", "车补次数", "车补", "总计");
final List<String> row = ListUtil.of("姓名", "加班日期", "下班时间", "加班时长", "餐补", "车补次数", "车补", "总计");
final ExcelWriter overtimeWriter = ExcelUtil.getWriter("e:/excel/single_line.xlsx");
overtimeWriter.writeRow(row);
overtimeWriter.close();
@@ -117,12 +117,12 @@ public class ExcelWriteTest {
final ExcelWriter writer = ExcelUtil.getWriterWithSheet("表格1");
// 写出第一张表
final List<String> row = ListUtil.toList("姓名", "加班日期", "下班时间", "加班时长", "餐补", "车补次数", "车补", "总计");
final List<String> row = ListUtil.of("姓名", "加班日期", "下班时间", "加班时长", "餐补", "车补次数", "车补", "总计");
writer.writeRow(row);
// 写出第二张表
writer.setSheet("表格2");
final List<String> row2 = ListUtil.toList("姓名2", "加班日期2", "下班时间2", "加班时长2", "餐补2", "车补次数2", "车补2", "总计2");
final List<String> row2 = ListUtil.of("姓名2", "加班日期2", "下班时间2", "加班时长2", "餐补2", "车补次数2", "车补2", "总计2");
writer.writeRow(row2);
// 生成文件或导出Excel
@@ -134,13 +134,13 @@ public class ExcelWriteTest {
@Test
@Ignore
public void writeTest() {
final List<?> row1 = ListUtil.toList("aaaaa", "bb", "cc", "dd", DateUtil.date(), 3.22676575765);
final List<?> row2 = ListUtil.toList("aa1", "bb1", "cc1", "dd1", DateUtil.date(), 250.7676);
final List<?> row3 = ListUtil.toList("aa2", "bb2", "cc2", "dd2", DateUtil.date(), 0.111);
final List<?> row4 = ListUtil.toList("aa3", "bb3", "cc3", "dd3", DateUtil.date(), 35);
final List<?> row5 = ListUtil.toList("aa4", "bb4", "cc4", "dd4", DateUtil.date(), 28.00);
final List<?> row1 = ListUtil.of("aaaaa", "bb", "cc", "dd", DateUtil.date(), 3.22676575765);
final List<?> row2 = ListUtil.of("aa1", "bb1", "cc1", "dd1", DateUtil.date(), 250.7676);
final List<?> row3 = ListUtil.of("aa2", "bb2", "cc2", "dd2", DateUtil.date(), 0.111);
final List<?> row4 = ListUtil.of("aa3", "bb3", "cc3", "dd3", DateUtil.date(), 35);
final List<?> row5 = ListUtil.of("aa4", "bb4", "cc4", "dd4", DateUtil.date(), 28.00);
final List<List<?>> rows = ListUtil.toList(row1, row2, row3, row4, row5);
final List<List<?>> rows = ListUtil.of(row1, row2, row3, row4, row5);
for (int i = 0; i < 400; i++) {
// 超大列表写出测试
rows.add(ObjUtil.clone(row1));
@@ -169,13 +169,13 @@ public class ExcelWriteTest {
@Test
@Ignore
public void mergeTest() {
final List<?> row1 = ListUtil.toList("aa", "bb", "cc", "dd", DateUtil.date(), 3.22676575765);
final List<?> row2 = ListUtil.toList("aa1", "bb1", "cc1", "dd1", DateUtil.date(), 250.7676);
final List<?> row3 = ListUtil.toList("aa2", "bb2", "cc2", "dd2", DateUtil.date(), 0.111);
final List<?> row4 = ListUtil.toList("aa3", "bb3", "cc3", "dd3", DateUtil.date(), 35);
final List<?> row5 = ListUtil.toList("aa4", "bb4", "cc4", "dd4", DateUtil.date(), 28.00);
final List<?> row1 = ListUtil.of("aa", "bb", "cc", "dd", DateUtil.date(), 3.22676575765);
final List<?> row2 = ListUtil.of("aa1", "bb1", "cc1", "dd1", DateUtil.date(), 250.7676);
final List<?> row3 = ListUtil.of("aa2", "bb2", "cc2", "dd2", DateUtil.date(), 0.111);
final List<?> row4 = ListUtil.of("aa3", "bb3", "cc3", "dd3", DateUtil.date(), 35);
final List<?> row5 = ListUtil.of("aa4", "bb4", "cc4", "dd4", DateUtil.date(), 28.00);
final List<List<?>> rows = ListUtil.toList(row1, row2, row3, row4, row5);
final List<List<?>> rows = ListUtil.of(row1, row2, row3, row4, row5);
// 通过工具类创建writer
final ExcelWriter writer = ExcelUtil.getWriter("d:/test/mergeTest.xlsx");
@@ -213,7 +213,7 @@ public class ExcelWriteTest {
row2.put("是否合格", false);
row2.put("考试日期", DateUtil.date());
final ArrayList<Map<String, Object>> rows = ListUtil.toList(row1, row2);
final ArrayList<Map<String, Object>> rows = ListUtil.of(row1, row2);
// 通过工具类创建writer
final ExcelWriter writer = ExcelUtil.getWriter("d:/test/writeMapTest.xlsx");
@@ -243,7 +243,7 @@ public class ExcelWriteTest {
row2.put("是否合格", false);
row2.put("考试日期", DateUtil.date());
final ArrayList<Map<String, Object>> rows = ListUtil.toList(row1, row2);
final ArrayList<Map<String, Object>> rows = ListUtil.of(row1, row2);
// 通过工具类创建writer
final ExcelWriter writer = ExcelUtil.getWriter("e:/excel/writeMapTest.xlsx");
@@ -325,7 +325,7 @@ public class ExcelWriteTest {
row2.put("score", 32.30);
row2.put("examDate", DateUtil.date());
final List<Map<Object, Object>> rows = ListUtil.toList(row1, row2);
final List<Map<Object, Object>> rows = ListUtil.of(row1, row2);
// 通过工具类创建writer
final String file = "d:/test/writeMapAlias.xlsx";
FileUtil.del(file);
@@ -360,7 +360,7 @@ public class ExcelWriteTest {
row2.put("score", 32.30);
row2.put("examDate", DateUtil.date());
final List<Map<Object, Object>> rows = ListUtil.toList(row1, row2);
final List<Map<Object, Object>> rows = ListUtil.of(row1, row2);
// 通过工具类创建writer
final String file = "f:/test/test_alias.xlsx";
FileUtil.del(file);
@@ -393,7 +393,7 @@ public class ExcelWriteTest {
row2.put("score", 32.30);
row2.put("examDate", DateUtil.date());
final List<Map<Object, Object>> rows = ListUtil.toList(row1, row2);
final List<Map<Object, Object>> rows = ListUtil.of(row1, row2);
// 通过工具类创建writer
final String file = "d:/test/test_alias.xls";
final ExcelWriter writer = ExcelUtil.getWriter(file, "test1");
@@ -424,7 +424,7 @@ public class ExcelWriteTest {
row2.put("score", 32.30);
row2.put("examDate", DateUtil.date());
final List<Map<Object, Object>> rows = ListUtil.toList(row1, row2);
final List<Map<Object, Object>> rows = ListUtil.of(row1, row2);
// 通过工具类创建writer
final String file = "d:/test/test_alias.xls";
final ExcelWriter writer = ExcelUtil.getWriter(file, "test1");
@@ -458,7 +458,7 @@ public class ExcelWriteTest {
bean2.setScore(38.50);
bean2.setExamDate(DateUtil.date());
final List<cn.hutool.poi.excel.TestBean> rows = ListUtil.toList(bean1, bean2);
final List<cn.hutool.poi.excel.TestBean> rows = ListUtil.of(bean1, bean2);
// 通过工具类创建writer
final String file = "e:/writeBeanTest.xlsx";
FileUtil.del(file);
@@ -490,7 +490,7 @@ public class ExcelWriteTest {
order1.setNum("456");
order1.setBody("body2");
final List<cn.hutool.poi.excel.OrderExcel> rows = ListUtil.toList(order1, order2);
final List<cn.hutool.poi.excel.OrderExcel> rows = ListUtil.of(order1, order2);
// 通过工具类创建writer
final String file = "f:/test/writeBeanTest2.xlsx";
FileUtil.del(file);
@@ -517,7 +517,7 @@ public class ExcelWriteTest {
@Test
@Ignore
public void addSelectTest() {
final List<String> row = ListUtil.toList("姓名", "加班日期", "下班时间", "加班时长", "餐补", "车补次数", "车补", "总计");
final List<String> row = ListUtil.of("姓名", "加班日期", "下班时间", "加班时长", "餐补", "车补次数", "车补", "总计");
final ExcelWriter overtimeWriter = ExcelUtil.getWriter("d:/test/single_line.xlsx");
overtimeWriter.writeCellValue(3, 4, "AAAA");
overtimeWriter.addSelect(3, 4, row.toArray(new String[0]));
@@ -674,7 +674,7 @@ public class ExcelWriteTest {
public void writeNumberFormatTest() {
final ExcelWriter writer = ExcelUtil.getWriter("d:/test/formatTest.xlsx");
writer.disableDefaultStyle();
writer.writeRow(ListUtil.toList(51.33333333, 90.111111111));
writer.writeRow(ListUtil.of(51.33333333, 90.111111111));
final CellStyle columnStyle = writer.createCellStyle(0, 0);
columnStyle.setDataFormat((short) BuiltinFormats.getBuiltinFormat("0.00"));
writer.close();
@@ -683,13 +683,13 @@ public class ExcelWriteTest {
@Test
@Ignore
public void writeSecHeadRowTest() {
final List<?> row1 = ListUtil.toList(1, "aa", "bb", "cc", "dd", "ee");
final List<?> row2 = ListUtil.toList(2, "aa1", "bb1", "cc1", "dd1", "ee1");
final List<?> row3 = ListUtil.toList(3, "aa2", "bb2", "cc2", "dd2", "ee2");
final List<?> row4 = ListUtil.toList(4, "aa3", "bb3", "cc3", "dd3", "ee3");
final List<?> row5 = ListUtil.toList(5, "aa4", "bb4", "cc4", "dd4", "ee4");
final List<?> row1 = ListUtil.of(1, "aa", "bb", "cc", "dd", "ee");
final List<?> row2 = ListUtil.of(2, "aa1", "bb1", "cc1", "dd1", "ee1");
final List<?> row3 = ListUtil.of(3, "aa2", "bb2", "cc2", "dd2", "ee2");
final List<?> row4 = ListUtil.of(4, "aa3", "bb3", "cc3", "dd3", "ee3");
final List<?> row5 = ListUtil.of(5, "aa4", "bb4", "cc4", "dd4", "ee4");
final List<List<?>> rows = ListUtil.toList(row1, row2, row3, row4, row5);
final List<List<?>> rows = ListUtil.of(row1, row2, row3, row4, row5);
// 通过工具类创建writer
final ExcelWriter writer = ExcelUtil.getWriter("d:/test/writeSecHeadRowTest.xlsx");
@@ -718,7 +718,7 @@ public class ExcelWriteTest {
writer.merge(2, 2, 4, 5, "DDEE", true);
writer.setCurrentRow(3);
final List<String> sechead = ListUtil.toList("AA", "BB", "DD", "EE");
final List<String> sechead = ListUtil.of("AA", "BB", "DD", "EE");
writer.writeSecHeadRow(sechead);
// 一次性写出内容，使用默认样式
writer.write(rows);
@@ -800,7 +800,7 @@ public class ExcelWriteTest {
@Ignore
public void changeHeaderStyleTest(){
final ExcelWriter writer = ExcelUtil.getWriter("d:/test/headerStyle.xlsx");
writer.writeHeadRow(ListUtil.of("姓名", "性别", "年龄"));
writer.writeHeadRow(ListUtil.view("姓名", "性别", "年龄"));
final CellStyle headCellStyle = writer.getStyleSet().getHeadCellStyle();
headCellStyle.setFillForegroundColor(IndexedColors.YELLOW1.index);
headCellStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND);
@@ -816,7 +816,7 @@ public class ExcelWriteTest {
FileUtil.del(path);
final ExcelWriter writer = ExcelUtil.getWriter(path);
writer.writeRow(ListUtil.of(22.9f));
writer.writeRow(ListUtil.view(22.9f));
writer.close();
}
@@ -826,7 +826,7 @@ public class ExcelWriteTest {
// https://gitee.com/dromara/hutool/issues/I466ZZ
// 需要输出S_20000314_x5116_0004
// 此处加入一个转义前缀：_x005F
final List<Object> row = ListUtil.of(new EscapeStrCellSetter("S_20000314_x5116_0004"));
final List<Object> row = ListUtil.view(new EscapeStrCellSetter("S_20000314_x5116_0004"));
final ExcelWriter writer = ExcelUtil.getWriter("d:/test/_x.xlsx");
writer.writeRow(row);
@@ -838,7 +838,7 @@ public class ExcelWriteTest {
public void writeLongTest(){
//https://gitee.com/dromara/hutool/issues/I49R6U
final ExcelWriter writer = ExcelUtil.getWriter("d:/test/long.xlsx");
writer.write(ListUtil.of(1427545395336093698L));
writer.write(ListUtil.view(1427545395336093698L));
writer.close();
}
@@ -849,7 +849,7 @@ public class ExcelWriteTest {
final Hyperlink hyperlink = writer.createHyperlink(HyperlinkType.URL, "https://hutool.cn");
writer.write(ListUtil.of(hyperlink));
writer.write(ListUtil.view(hyperlink));
writer.close();
}

4
hutool-poi/src/test/java/cn/hutool/poi/excel/Issue2221Test.java
View File

@@ -27,7 +27,7 @@ public class Issue2221Test {
writer.setOnlyAlias(true);
// 写入数据
final List<Map<Object, Object>> data = ListUtil.of(
final List<Map<Object, Object>> data = ListUtil.view(
MapUtil.ofEntries(MapUtil.entry("androidLc", "1次"), MapUtil.entry("androidAc", "3人")),
MapUtil.ofEntries(MapUtil.entry("androidLc", "1次"), MapUtil.entry("androidAc", "3人"))
);
@@ -75,7 +75,7 @@ public class Issue2221Test {
writer.merge(0, 0, 3, 4, "新增人数", true);
// 写入数据
final List<Map<Object, Object>> data = ListUtil.of(
final List<Map<Object, Object>> data = ListUtil.view(
MapUtil.ofEntries(
MapUtil.entry("date", "2022-01-01"),
MapUtil.entry("androidLc", "1次"),

8
hutool-poi/src/test/java/cn/hutool/poi/word/WordWriterTest.java
View File

@@ -48,7 +48,7 @@ public class WordWriterTest {
map.put("成绩", 88.32);
map.put("是否合格", true);
writer.addTable(ListUtil.toList(map));
writer.addTable(ListUtil.of(map));
writer.flush(FileUtil.file("d:/test/test.docx"));
}
@@ -71,7 +71,7 @@ public class WordWriterTest {
data2.put("是否合格", false);
data2.put("考试日期", DateUtil.date());
final ArrayList<Map<String, Object>> mapArrayList = ListUtil.toList(data, data2);
final ArrayList<Map<String, Object>> mapArrayList = ListUtil.of(data, data2);
// 添加段落（标题）
writer.addText(new Font("方正小标宋简体", Font.PLAIN, 22), "我是第一部分");
@@ -87,8 +87,8 @@ public class WordWriterTest {
@Test
public void overflowTest(){
final Word07Writer word07Writer = new Word07Writer();
final List<Object> list = ListUtil.list(false);
final List<Object> list2 = ListUtil.list(false);
final List<Object> list = ListUtil.of(false);
final List<Object> list2 = ListUtil.of(false);
list.add("溢出测试");
list2.add(list);
word07Writer.addTable(list);