From d8fd1e16aa3231a20a8cbd113be03f52b2e50d2a Mon Sep 17 00:00:00 2001
From: Looly <loolly@gmail.com>
Date: Sun, 15 Nov 2020 00:36:07 +0800
Subject: [PATCH] add null edit

---
 CHANGELOG.md                                  |  11 +-
 .../java/cn/hutool/core/util/StrUtilTest.java |   9 +
 .../hutool/extra/compress/CompressUtil.java   |  74 +++++-
 .../compress/archiver/SevenZArchiver.java     |  13 +-
 .../java/cn/hutool/poi/excel/RowUtil.java     |   2 +-
 .../cn/hutool/poi/excel/cell/CellUtil.java    |  26 +-
 .../cn/hutool/poi/excel/cell/NullCell.java    | 240 ++++++++++++++++++
 .../hutool/poi/excel/test/ExcelReadTest.java  |  17 ++
 .../src/test/resources/null_cell_test.xlsx    | Bin 0 -> 8789 bytes
 9 files changed, 374 insertions(+), 18 deletions(-)
 create mode 100644 hutool-poi/src/main/java/cn/hutool/poi/excel/cell/NullCell.java
 create mode 100644 hutool-poi/src/test/resources/null_cell_test.xlsx

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00729e860..58d538385 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,20 +5,23 @@
 
 # 5.5.0 (2020-11-14)
 
+### 大版本特性
+* 【extra  】     增加jakarta.validation-api封装：ValidationUtil（pr#207@Gitee）
+* 【extra  】     增加表达式引擎封装：ExpressionUtil（pr#1203@Github）
+* 【extra  】     新增基于Apache-FtpServer封装：SimpleFtpServer
+* 【extra  】     新增基于Commons-Compress封装：CompressUtil
+
 ### 新特性
 * 【core   】     NumberUtil.parseInt等支持123,2.00这类数字（issue#I23ORQ@Gitee）
 * 【core   】     增加ArrayUtil.isSub、indexOfSub、lastIndexOfSub方法（issue#I23O1K@Gitee）
-* 【extra  】     增加ValidationUtil（pr#207@Gitee）
 * 【core   】     反射调用支持传递参数的值为null（pr#1205@Github）
 * 【core   】     HexUtil增加format方法（issue#I245NF@Gitee）
 * 【poi    】     ExcelWriter增加setCurrentRowToEnd方法（issue#I24A2R@Gitee）
 * 【core   】     ExcelWriter增加setCurrentRowToEnd方法（issue#I24A2R@Gitee）
-* 【extra  】     增加表达式引擎封装（ExpressionUtil）（pr#1203@Github）
 * 【core   】     增加enum转数字支持（issue#I24QZY@Gitee）
 * 【core   】     NumberUtil.toBigDecimal空白符转换为0（issue#I24MRP@Gitee）
 * 【core   】     CollUtil和IterUtil增加size方法（pr#208@Gitee）
-* 【extra  】     新增SimpleFtpServer
-* 【extra  】     新增CompressUtil压缩封装
+* 【poi    】     ExcelReader的read方法读取空单元格增加CellEditor处理（issue#1213@Github）
 
 ### Bug修复
 * 【core   】     修复DateUtil.current使用System.nanoTime的问题（issue#1198@Github）
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/StrUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/StrUtilTest.java
index 3479a5d8a..8cbdb7eb2 100644
--- a/hutool-core/src/test/java/cn/hutool/core/util/StrUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/StrUtilTest.java
@@ -1,5 +1,6 @@
 package cn.hutool.core.util;
 
+import cn.hutool.core.lang.Console;
 import cn.hutool.core.lang.Dict;
 import org.junit.Assert;
 import org.junit.Test;
@@ -433,6 +434,14 @@ public class StrUtilTest {
 		Assert.assertEquals(0, results2.length);
 	}
 
+	@Test
+	public void subBetweenAllTest3() {
+		String src1 = "'abc'and'123'";
+
+		final String[] strings = StrUtil.subBetweenAll(src1, "'", "'");
+		Console.log(strings);
+	}
+
 	@Test
 	public void briefTest() {
 		String str = RandomUtil.randomString(1000);
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/compress/CompressUtil.java b/hutool-extra/src/main/java/cn/hutool/extra/compress/CompressUtil.java
index 07db936c7..fdd0cda3c 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/compress/CompressUtil.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/compress/CompressUtil.java
@@ -1,5 +1,7 @@
 package cn.hutool.extra.compress;
 
+import cn.hutool.core.io.IoUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.compress.archiver.Archiver;
 import cn.hutool.extra.compress.archiver.SevenZArchiver;
 import cn.hutool.extra.compress.archiver.StreamArchiver;
@@ -8,6 +10,10 @@ import cn.hutool.extra.compress.extractor.SenvenZExtractor;
 import cn.hutool.extra.compress.extractor.StreamExtractor;
 import org.apache.commons.compress.archivers.ArchiveStreamFactory;
 import org.apache.commons.compress.archivers.StreamingNotSupportedException;
+import org.apache.commons.compress.compressors.CompressorException;
+import org.apache.commons.compress.compressors.CompressorInputStream;
+import org.apache.commons.compress.compressors.CompressorOutputStream;
+import org.apache.commons.compress.compressors.CompressorStreamFactory;
 
 import java.io.File;
 import java.io.InputStream;
@@ -23,6 +29,62 @@ import java.nio.charset.Charset;
  */
 public class CompressUtil {
 
+	/**
+	 * 获取压缩输出流，用于压缩指定内容，支持的格式例如：
+	 * <ul>
+	 *     <li>{@value CompressorStreamFactory#GZIP}</li>
+	 *     <li>{@value CompressorStreamFactory#BZIP2}</li>
+	 *     <li>{@value CompressorStreamFactory#XZ}</li>
+	 *     <li>{@value CompressorStreamFactory#PACK200}</li>
+	 *     <li>{@value CompressorStreamFactory#SNAPPY_FRAMED}</li>
+	 *     <li>{@value CompressorStreamFactory#LZ4_BLOCK}</li>
+	 *     <li>{@value CompressorStreamFactory#LZ4_FRAMED}</li>
+	 *     <li>{@value CompressorStreamFactory#ZSTANDARD}</li>
+	 *     <li>{@value CompressorStreamFactory#DEFLATE}</li>
+	 * </ul>
+	 *
+	 * @param compressorName 压缩名称，见：{@link CompressorStreamFactory}
+	 * @param out            输出流，可以输出到内存、网络或文件
+	 * @return {@link CompressorOutputStream}
+	 */
+	public CompressorOutputStream getOut(String compressorName, OutputStream out) {
+		try {
+			return new CompressorStreamFactory().createCompressorOutputStream(compressorName, out);
+		} catch (CompressorException e) {
+			throw new CompressException(e);
+		}
+	}
+
+	/**
+	 * 获取压缩输入流，用于解压缩指定内容，支持的格式例如：
+	 * <ul>
+	 *     <li>{@value CompressorStreamFactory#GZIP}</li>
+	 *     <li>{@value CompressorStreamFactory#BZIP2}</li>
+	 *     <li>{@value CompressorStreamFactory#XZ}</li>
+	 *     <li>{@value CompressorStreamFactory#PACK200}</li>
+	 *     <li>{@value CompressorStreamFactory#SNAPPY_FRAMED}</li>
+	 *     <li>{@value CompressorStreamFactory#LZ4_BLOCK}</li>
+	 *     <li>{@value CompressorStreamFactory#LZ4_FRAMED}</li>
+	 *     <li>{@value CompressorStreamFactory#ZSTANDARD}</li>
+	 *     <li>{@value CompressorStreamFactory#DEFLATE}</li>
+	 * </ul>
+	 *
+	 * @param compressorName 压缩名称，见：{@link CompressorStreamFactory}，null表示自动检测
+	 * @param in            输出流，可以输出到内存、网络或文件
+	 * @return {@link CompressorOutputStream}
+	 */
+	public CompressorInputStream getIn(String compressorName, InputStream in) {
+		in = IoUtil.toMarkSupportStream(in);
+		try {
+			if(StrUtil.isBlank(compressorName)){
+				compressorName = CompressorStreamFactory.detect(in);
+			}
+			return new CompressorStreamFactory().createCompressorInputStream(compressorName, in);
+		} catch (CompressorException e) {
+			throw new CompressException(e);
+		}
+	}
+
 	/**
 	 * 创建归档器，支持：
 	 * <ul>
@@ -108,11 +170,11 @@ public class CompressUtil {
 		if (ArchiveStreamFactory.SEVEN_Z.equalsIgnoreCase(archiverName)) {
 			return new SenvenZExtractor(file);
 		}
-		try{
+		try {
 			return new StreamExtractor(charset, archiverName, file);
-		} catch (CompressException e){
+		} catch (CompressException e) {
 			final Throwable cause = e.getCause();
-			if(cause instanceof StreamingNotSupportedException && cause.getMessage().contains("7z")){
+			if (cause instanceof StreamingNotSupportedException && cause.getMessage().contains("7z")) {
 				return new SenvenZExtractor(file);
 			}
 			throw e;
@@ -158,11 +220,11 @@ public class CompressUtil {
 		if (ArchiveStreamFactory.SEVEN_Z.equalsIgnoreCase(archiverName)) {
 			return new SenvenZExtractor(in);
 		}
-		try{
+		try {
 			return new StreamExtractor(charset, archiverName, in);
-		} catch (CompressException e){
+		} catch (CompressException e) {
 			final Throwable cause = e.getCause();
-			if(cause instanceof StreamingNotSupportedException && cause.getMessage().contains("7z")){
+			if (cause instanceof StreamingNotSupportedException && cause.getMessage().contains("7z")) {
 				return new SenvenZExtractor(in);
 			}
 			throw e;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/SevenZArchiver.java b/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/SevenZArchiver.java
index 9f371a9c6..4a926765b 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/SevenZArchiver.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/SevenZArchiver.java
@@ -66,6 +66,15 @@ public class SevenZArchiver implements Archiver {
 		}
 	}
 
+	/**
+	 * 获取{@link SevenZOutputFile}以便自定义相关设置
+	 *
+	 * @return {@link SevenZOutputFile}
+	 */
+	public SevenZOutputFile getSevenZOutputFile() {
+		return this.sevenZOutputFile;
+	}
+
 	@Override
 	public SevenZArchiver add(File file, String path, Filter<File> filter) {
 		try {
@@ -93,9 +102,9 @@ public class SevenZArchiver implements Archiver {
 		} catch (Exception ignore) {
 			//ignore
 		}
-		if(null != out && this.channel instanceof SeekableInMemoryByteChannel){
+		if (null != out && this.channel instanceof SeekableInMemoryByteChannel) {
 			try {
-				out.write(((SeekableInMemoryByteChannel)this.channel).array());
+				out.write(((SeekableInMemoryByteChannel) this.channel).array());
 			} catch (IOException e) {
 				throw new IORuntimeException(e);
 			}
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/RowUtil.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/RowUtil.java
index c7a9f0d94..d2711a065 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/RowUtil.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/RowUtil.java
@@ -73,7 +73,7 @@ public class RowUtil {
 		Object cellValue;
 		boolean isAllNull = true;
 		for (int i = startCellNumInclude; i < size; i++) {
-			cellValue = CellUtil.getCellValue(row.getCell(i), cellEditor);
+			cellValue = CellUtil.getCellValue(CellUtil.getCell(row, i), cellEditor);
 			isAllNull &= StrUtil.isEmptyIfStr(cellValue);
 			cellValues.add(cellValue);
 		}
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/CellUtil.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/CellUtil.java
index 0d24577d7..2b71e08aa 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/CellUtil.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/CellUtil.java
@@ -74,10 +74,7 @@ public class CellUtil {
 	 * @return 值，类型可能为：Date、Double、Boolean、String
 	 */
 	public static Object getCellValue(Cell cell, CellEditor cellEditor) {
-		if (null == cell) {
-			return null;
-		}
-		return getCellValue(cell, cell.getCellTypeEnum(), cellEditor);
+		return getCellValue(cell, null, cellEditor);
 	}
 
 	/**
@@ -105,6 +102,9 @@ public class CellUtil {
 		if (null == cell) {
 			return null;
 		}
+		if(cell instanceof NullCell){
+			return null == cellEditor ? null : cellEditor.edit(cell, null);
+		}
 		if (null == cellType) {
 			cellType = cell.getCellTypeEnum();
 		}
@@ -235,7 +235,23 @@ public class CellUtil {
 	}
 
 	/**
-	 * 获取已有行或创建新行
+	 *获取单元格，如果单元格不存在，返回{@link NullCell}
+	 *
+	 * @param row       Excel表的行
+	 * @param cellIndex 列号
+	 * @return {@link Row}
+	 * @since 5.5.0
+	 */
+	public static Cell getCell(Row row, int cellIndex) {
+		Cell cell = row.getCell(cellIndex);
+		if (null == cell) {
+			return new NullCell(row, cellIndex);
+		}
+		return cell;
+	}
+
+	/**
+	 * 获取已有单元格或创建新单元格
 	 *
 	 * @param row       Excel表的行
 	 * @param cellIndex 列号
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/NullCell.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/NullCell.java
new file mode 100644
index 000000000..ac750b061
--- /dev/null
+++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/NullCell.java
@@ -0,0 +1,240 @@
+package cn.hutool.poi.excel.cell;
+
+import org.apache.poi.ss.formula.FormulaParseException;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.CellType;
+import org.apache.poi.ss.usermodel.Comment;
+import org.apache.poi.ss.usermodel.Hyperlink;
+import org.apache.poi.ss.usermodel.RichTextString;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.util.CellAddress;
+import org.apache.poi.ss.util.CellRangeAddress;
+
+import java.time.LocalDateTime;
+import java.util.Calendar;
+import java.util.Date;
+
+/**
+ * 当单元格不存在时使用此对象表示，得到的值都为null,此对象只用于标注单元格所在位置信息。
+ *
+ * @author looly
+ * @since 5.5.0
+ */
+public class NullCell implements Cell {
+
+	private final Row row;
+	private final int columnIndex;
+
+	/**
+	 * 构造
+	 *
+	 * @param row         行
+	 * @param columnIndex 列号，从0开始
+	 */
+	public NullCell(Row row, int columnIndex) {
+		this.row = row;
+		this.columnIndex = columnIndex;
+	}
+
+	@Override
+	public int getColumnIndex() {
+		return this.columnIndex;
+	}
+
+	@Override
+	public int getRowIndex() {
+		return getRow().getRowNum();
+	}
+
+	@Override
+	public Sheet getSheet() {
+		return getRow().getSheet();
+	}
+
+	@Override
+	public Row getRow() {
+		return this.row;
+	}
+
+	@Override
+	public void setCellType(CellType cellType) {
+		throw new UnsupportedOperationException("Can not set any thing to null cell!");
+	}
+
+	@Override
+	public void setBlank() {
+		throw new UnsupportedOperationException("Can not set any thing to null cell!");
+	}
+
+	@Override
+	public CellType getCellType() {
+		return null;
+	}
+
+	@Override
+	public CellType getCellTypeEnum() {
+		return null;
+	}
+
+	@Override
+	public CellType getCachedFormulaResultType() {
+		return null;
+	}
+
+	@Override
+	public CellType getCachedFormulaResultTypeEnum() {
+		return null;
+	}
+
+	@Override
+	public void setCellValue(double value) {
+		throw new UnsupportedOperationException("Can not set any thing to null cell!");
+	}
+
+	@Override
+	public void setCellValue(Date value) {
+		throw new UnsupportedOperationException("Can not set any thing to null cell!");
+	}
+
+	@Override
+	public void setCellValue(LocalDateTime value) {
+		throw new UnsupportedOperationException("Can not set any thing to null cell!");
+	}
+
+	@Override
+	public void setCellValue(Calendar value) {
+		throw new UnsupportedOperationException("Can not set any thing to null cell!");
+	}
+
+	@Override
+	public void setCellValue(RichTextString value) {
+		throw new UnsupportedOperationException("Can not set any thing to null cell!");
+	}
+
+	@Override
+	public void setCellValue(String value) {
+		throw new UnsupportedOperationException("Can not set any thing to null cell!");
+	}
+
+	@Override
+	public void setCellFormula(String formula) throws FormulaParseException, IllegalStateException {
+		throw new UnsupportedOperationException("Can not set any thing to null cell!");
+	}
+
+	@Override
+	public void removeFormula() throws IllegalStateException {
+		throw new UnsupportedOperationException("Can not set any thing to null cell!");
+	}
+
+	@Override
+	public String getCellFormula() {
+		return null;
+	}
+
+	@Override
+	public double getNumericCellValue() {
+		throw new UnsupportedOperationException("Cell value is null!");
+	}
+
+	@Override
+	public Date getDateCellValue() {
+		return null;
+	}
+
+	@Override
+	public LocalDateTime getLocalDateTimeCellValue() {
+		return null;
+	}
+
+	@Override
+	public RichTextString getRichStringCellValue() {
+		return null;
+	}
+
+	@Override
+	public String getStringCellValue() {
+		return null;
+	}
+
+	@Override
+	public void setCellValue(boolean value) {
+		throw new UnsupportedOperationException("Can not set any thing to null cell!");
+	}
+
+	@Override
+	public void setCellErrorValue(byte value) {
+		throw new UnsupportedOperationException("Can not set any thing to null cell!");
+	}
+
+	@Override
+	public boolean getBooleanCellValue() {
+		throw new UnsupportedOperationException("Cell value is null!");
+	}
+
+	@Override
+	public byte getErrorCellValue() {
+		throw new UnsupportedOperationException("Cell value is null!");
+	}
+
+	@Override
+	public void setCellStyle(CellStyle style) {
+		throw new UnsupportedOperationException("Can not set any thing to null cell!");
+	}
+
+	@Override
+	public CellStyle getCellStyle() {
+		return null;
+	}
+
+	@Override
+	public void setAsActiveCell() {
+		throw new UnsupportedOperationException("Can not set any thing to null cell!");
+	}
+
+	@Override
+	public CellAddress getAddress() {
+		return null;
+	}
+
+	@Override
+	public void setCellComment(Comment comment) {
+		throw new UnsupportedOperationException("Can not set any thing to null cell!");
+	}
+
+	@Override
+	public Comment getCellComment() {
+		return null;
+	}
+
+	@Override
+	public void removeCellComment() {
+		throw new UnsupportedOperationException("Can not set any thing to null cell!");
+	}
+
+	@Override
+	public Hyperlink getHyperlink() {
+		return null;
+	}
+
+	@Override
+	public void setHyperlink(Hyperlink link) {
+		throw new UnsupportedOperationException("Can not set any thing to null cell!");
+	}
+
+	@Override
+	public void removeHyperlink() {
+		throw new UnsupportedOperationException("Can not set any thing to null cell!");
+	}
+
+	@Override
+	public CellRangeAddress getArrayFormulaRange() {
+		return null;
+	}
+
+	@Override
+	public boolean isPartOfArrayFormulaGroup() {
+		throw new UnsupportedOperationException("Cell value is null!");
+	}
+}
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/test/ExcelReadTest.java b/hutool-poi/src/test/java/cn/hutool/poi/excel/test/ExcelReadTest.java
index 6137f47de..459348ec1 100644
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/test/ExcelReadTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/poi/excel/test/ExcelReadTest.java
@@ -3,6 +3,7 @@ package cn.hutool.poi.excel.test;
 import cn.hutool.core.io.resource.ResourceUtil;
 import cn.hutool.core.lang.Console;
 import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.poi.excel.ExcelReader;
 import cn.hutool.poi.excel.ExcelUtil;
 import lombok.Data;
@@ -201,4 +202,20 @@ public class ExcelReadTest {
 			Console.log(list);
 		}
 	}
+
+	@Test
+	public void nullValueEditTest(){
+		final ExcelReader reader = ExcelUtil.getReader("null_cell_test.xlsx");
+		reader.setCellEditor((cell, value)-> ObjectUtil.defaultIfNull(value, "#"));
+		final List<List<Object>> read = reader.read();
+
+		// 对于任意一个单元格有值的情况下，之前的单元格值按照null处理
+		Assert.assertEquals(1, read.get(1).size());
+		Assert.assertEquals(2, read.get(2).size());
+		Assert.assertEquals(3, read.get(3).size());
+
+		Assert.assertEquals("#", read.get(2).get(0));
+		Assert.assertEquals("#", read.get(3).get(0));
+		Assert.assertEquals("#", read.get(3).get(1));
+	}
 }
diff --git a/hutool-poi/src/test/resources/null_cell_test.xlsx b/hutool-poi/src/test/resources/null_cell_test.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..9329db5683612a1dd3726ef70a6737991a571316
GIT binary patch
literal 8789
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

literal 0
HcmV?d00001