From 8d5851a81fb07b2659c26911031f83e037a5eda7 Mon Sep 17 00:00:00 2001 From: Looly Date: Sat, 22 Oct 2022 21:26:20 +0800 Subject: [PATCH] fix code --- .../poi/excel/cell/editors/package-info.java | 2 +- .../poi/excel/cell/setters/package-info.java | 6 +++ .../cell/{ => values}/FormulaCellValue.java | 4 +- .../poi/excel/cell/values/package-info.java | 6 +++ .../poi/excel/sax/SheetDataSaxHandler.java | 2 +- .../cn/hutool/poi/excel/ExcelSaxReadTest.java | 2 +- .../cn/hutool/poi/excel/ExcelWriteTest.java | 46 +++++++++---------- 7 files changed, 41 insertions(+), 27 deletions(-) create mode 100755 hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/package-info.java rename hutool-poi/src/main/java/cn/hutool/poi/excel/cell/{ => values}/FormulaCellValue.java (90%) create mode 100755 hutool-poi/src/main/java/cn/hutool/poi/excel/cell/values/package-info.java diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/editors/package-info.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/editors/package-info.java index 77d9c7f56..d7bba861d 100644 --- a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/editors/package-info.java +++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/editors/package-info.java @@ -1,6 +1,6 @@ /** * 单元格值编辑器，内部使用 - * @author looly * + * @author looly */ package cn.hutool.poi.excel.cell.editors; diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/package-info.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/package-info.java new file mode 100755 index 000000000..d73f7e095 --- /dev/null +++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/package-info.java @@ -0,0 +1,6 @@ +/** + * 单元格值自定义设置器，主要用于Excel数据导出，用户通过自定义此接口，实现可定制化的单元格值设定 + * + * @author looly + */ +package cn.hutool.poi.excel.cell.setters; diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/FormulaCellValue.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/values/FormulaCellValue.java similarity index 90% rename from hutool-poi/src/main/java/cn/hutool/poi/excel/cell/FormulaCellValue.java rename to hutool-poi/src/main/java/cn/hutool/poi/excel/cell/values/FormulaCellValue.java index 24d18a7d8..1e3e53f2c 100644 --- a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/FormulaCellValue.java +++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/values/FormulaCellValue.java @@ -1,5 +1,7 @@ -package cn.hutool.poi.excel.cell; +package cn.hutool.poi.excel.cell.values; +import cn.hutool.poi.excel.cell.CellSetter; +import cn.hutool.poi.excel.cell.CellValue; import org.apache.poi.ss.usermodel.Cell; /** diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/values/package-info.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/values/package-info.java new file mode 100755 index 000000000..7e07d530c --- /dev/null +++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/values/package-info.java @@ -0,0 +1,6 @@ +/** + * 不同类型单元格值的封装 + * + * @author looly + */ +package cn.hutool.poi.excel.cell.values; diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/SheetDataSaxHandler.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/SheetDataSaxHandler.java index 3572f45cb..5cb233659 100644 --- a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/SheetDataSaxHandler.java +++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/SheetDataSaxHandler.java @@ -2,7 +2,7 @@ package cn.hutool.poi.excel.sax; import cn.hutool.core.text.StrUtil; import cn.hutool.core.util.ObjUtil; -import cn.hutool.poi.excel.cell.FormulaCellValue; +import cn.hutool.poi.excel.cell.values.FormulaCellValue; import cn.hutool.poi.excel.sax.handler.RowHandler; import org.apache.poi.ss.usermodel.BuiltinFormats; import org.apache.poi.xssf.model.SharedStrings; diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelSaxReadTest.java b/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelSaxReadTest.java index 35e428dda..2107b43b3 100644 --- a/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelSaxReadTest.java +++ b/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelSaxReadTest.java @@ -6,7 +6,7 @@ import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.IoUtil; import cn.hutool.core.lang.Console; import cn.hutool.core.text.StrUtil; -import cn.hutool.poi.excel.cell.FormulaCellValue; +import cn.hutool.poi.excel.cell.values.FormulaCellValue; import cn.hutool.poi.excel.sax.Excel03SaxReader; import cn.hutool.poi.excel.sax.handler.RowHandler; import cn.hutool.poi.exceptions.POIException; diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelWriteTest.java b/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelWriteTest.java index f70b4324d..0c453b953 100755 --- a/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelWriteTest.java +++ b/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelWriteTest.java @@ -45,7 +45,7 @@ import java.util.TreeMap; public class ExcelWriteTest { @Test - public void writeNoFlushTest(){ + public void writeNoFlushTest() { 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); @@ -617,7 +617,7 @@ public class ExcelWriteTest { final Font headFont = writer.createFont(); headFont.setBold(true); - headFont.setFontHeightInPoints((short)50); + headFont.setFontHeightInPoints((short) 50); headFont.setFontName("Microsoft YaHei"); writer.getStyleSet().getHeadCellStyle().setFont(headFont); @@ -755,20 +755,20 @@ public class ExcelWriteTest { @Test @Ignore - public void mergeTest3(){ + public void mergeTest3() { // https://github.com/dromara/hutool/issues/1696 - final List> list = new ArrayList<>(); - final Map map = new HashMap<>(); - map.put("xmnf","2021"); + final List> list = new ArrayList<>(); + final Map map = new HashMap<>(); + map.put("xmnf", "2021"); list.add(map); - final Map map1 = new HashMap<>(); - map1.put("xmnf",new XSSFRichTextString("9999")); + final Map map1 = new HashMap<>(); + map1.put("xmnf", new XSSFRichTextString("9999")); list.add(map1); - final Map map2 = new HashMap<>(); - map2.put("xmnf","2019"); + final Map map2 = new HashMap<>(); + map2.put("xmnf", "2019"); list.add(map2); //通过工具类创建writer @@ -785,7 +785,7 @@ public class ExcelWriteTest { @Test @Ignore - public void mergeForDateTest(){ + public void mergeForDateTest() { // https://github.com/dromara/hutool/issues/1911 //通过工具类创建writer @@ -798,7 +798,7 @@ public class ExcelWriteTest { @Test @Ignore - public void changeHeaderStyleTest(){ + public void changeHeaderStyleTest() { final ExcelWriter writer = ExcelUtil.getWriter("d:/test/headerStyle.xlsx"); writer.writeHeadRow(ListUtil.view("姓名", "性别", "年龄")); final CellStyle headCellStyle = writer.getStyleSet().getHeadCellStyle(); @@ -810,7 +810,7 @@ public class ExcelWriteTest { @Test @Ignore - public void writeFloatTest(){ + public void writeFloatTest() { //issue https://gitee.com/dromara/hutool/issues/I43U9G final String path = "d:/test/floatTest.xlsx"; FileUtil.del(path); @@ -822,7 +822,7 @@ public class ExcelWriteTest { @Test //@Ignore - public void writeDoubleTest(){ + public void writeDoubleTest() { // https://gitee.com/dromara/hutool/issues/I5PI5C final String path = "d:/test/doubleTest.xlsx"; FileUtil.del(path); @@ -835,7 +835,7 @@ public class ExcelWriteTest { @Test @Ignore - public void issueI466ZZTest(){ + public void issueI466ZZTest() { // https://gitee.com/dromara/hutool/issues/I466ZZ // 需要输出S_20000314_x5116_0004 // 此处加入一个转义前缀：_x005F @@ -848,7 +848,7 @@ public class ExcelWriteTest { @Test @Ignore - public void writeLongTest(){ + public void writeLongTest() { //https://gitee.com/dromara/hutool/issues/I49R6U final ExcelWriter writer = ExcelUtil.getWriter("d:/test/long.xlsx"); writer.write(ListUtil.view(1427545395336093698L)); @@ -857,8 +857,8 @@ public class ExcelWriteTest { @Test @Ignore - public void writeHyperlinkTest(){ - final ExcelWriter writer = ExcelUtil.getWriter("d:/test/hyperlink.xlsx"); + public void writeHyperlinkTest() { + final ExcelWriter writer = ExcelUtil.getWriter("d:/test/hyperlink.xlsx"); final Hyperlink hyperlink = writer.createHyperlink(HyperlinkType.URL, "https://hutool.cn"); @@ -868,12 +868,12 @@ public class ExcelWriteTest { @Test @Ignore - public void mergeNumberTest(){ - final File tempFile=new File("d:/test/mergeNumber.xlsx"); + public void mergeNumberTest() { + final File tempFile = new File("d:/test/mergeNumber.xlsx"); FileUtil.del(tempFile); - final BigExcelWriter writer= new BigExcelWriter(tempFile); - writer.merge(0,1,2,2,3.99,false); + final BigExcelWriter writer = new BigExcelWriter(tempFile); + writer.merge(0, 1, 2, 2, 3.99, false); writer.close(); } @@ -892,7 +892,7 @@ public class ExcelWriteTest { } @Test - public void getDispositionTest(){ + public void getDispositionTest() { final ExcelWriter writer = ExcelUtil.getWriter(true); final String disposition = writer.getDisposition("测试A12.xlsx", CharsetUtil.UTF_8); Assert.assertEquals("attachment; filename=\"%E6%B5%8B%E8%AF%95A12.xlsx\"", disposition);