Merge branch 'refs/heads/master' into feat-20240604

# Conflicts:
#	easyexcel-core/src/main/java/com/alibaba/excel/read/listener/ModelBuildEventListener.java

.github/workflows/ci.yml

@@ -23,7 +23,7 @@ jobs:
  runs-on: ubuntu-latest
  strategy:
  matrix:
- java: [ 8, 11, 17]
+ java: [ 8, 11, 17, 21]
  distribution: [ 'adopt' ]
  fail-fast: false
  max-parallel: 4
@@ -37,7 +37,7 @@ jobs:
  java-version: ${{ matrix.java }}
  distribution: ${{ matrix.distribution }}
  - name: Cache local Maven repository
- uses: actions/cache@v3
+ uses: actions/cache@main
  with:
  path: ~/.m2/repository
  key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
@@ -46,7 +46,11 @@ jobs:
  - name: Chmod
  run: chmod +x mvnw
  - name: Test with Maven
+ if: ${{ matrix.java == '8' }}
  run: ./mvnw test -B -Dmaven.test.skip=false
+ - name: Test with Maven
+ if: ${{ matrix.java != '8' }}
+ run: ./mvnw test -B -Dmaven.test.skip=false -DargLine="--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/sun.reflect.annotation=ALL-UNNAMED"
  - name: Maven Build
  run: ./mvnw install -B -V
  - name: Java Doc

.github/workflows/release.yml

@@ -37,7 +37,7 @@ jobs:
  server-username: MAVEN_USERNAME
  server-password: MAVEN_PASSWORD
  - name: Cache local Maven repository
- uses: actions/cache@v3
+ uses: actions/cache@main
  with:
  path: ~/.m2/repository
  key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}

README.md

@@ -33,7 +33,7 @@ easyexcel重写了poi对07版Excel的解析，一个3M的excel用POI sax解析
 <dependency>
  <groupId>com.alibaba</groupId>
  <artifactId>easyexcel</artifactId>
- <version>3.3.4</version>
+ <version>4.0.1</version>
 </dependency>
 ```
 

easyexcel-core/pom.xml

@@ -28,10 +28,6 @@
  <groupId>org.apache.poi</groupId>
  <artifactId>poi-ooxml</artifactId>
  </dependency>
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-ooxml-schemas</artifactId>
- </dependency>
  <dependency>
  <groupId>org.apache.commons</groupId>
  <artifactId>commons-csv</artifactId>
@@ -40,9 +36,5 @@
  <groupId>org.ehcache</groupId>
  <artifactId>ehcache</artifactId>
  </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
  </dependencies>
 </project>

easyexcel-core/src/main/java/com/alibaba/excel/analysis/v07/XlsxSaxAnalyser.java

@@ -33,7 +33,6 @@
 import com.alibaba.excel.util.StringUtils;
 
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.openxml4j.opc.OPCPackage;
 import org.apache.poi.openxml4j.opc.PackageAccess;
@@ -43,10 +42,9 @@
 import org.apache.poi.openxml4j.opc.PackagingURIHelper;
 import org.apache.poi.ss.util.CellAddress;
 import org.apache.poi.xssf.eventusermodel.XSSFReader;
+import org.apache.poi.xssf.model.Comments;
 import org.apache.poi.xssf.model.CommentsTable;
-import org.apache.poi.xssf.model.SharedStringsTable;
 import org.apache.poi.xssf.usermodel.XSSFComment;
-import org.apache.poi.xssf.usermodel.XSSFRelation;
 import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTWorkbook;
 import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTWorkbookPr;
 import org.openxmlformats.schemas.spreadsheetml.x2006.main.WorkbookDocument;
@@ -123,9 +121,9 @@ public XlsxSaxAnalyser(XlsxReadContext xlsxReadContext, InputStream decryptedStr
  sheetList.add(new ReadSheet(index, ite.getSheetName()));
  sheetMap.put(index, inputStream);
  if (xlsxReadContext.readWorkbookHolder().getExtraReadSet().contains(CellExtraTypeEnum.COMMENT)) {
- CommentsTable commentsTable = ite.getSheetComments();
- if (null != commentsTable) {
- commentsTableMap.put(index, commentsTable);
+ Comments comments = ite.getSheetComments();
+ if (comments instanceof CommentsTable) {
+ commentsTableMap.put(index, (CommentsTable) comments);
  }
  }
  if (xlsxReadContext.readWorkbookHolder().getExtraReadSet().contains(CellExtraTypeEnum.HYPERLINK)) {
@@ -181,7 +179,7 @@ private void analysisUse1904WindowDate(XSSFReader xssfReader, XlsxReadWorkbookHo
  }
 
  private void analysisSharedStringsTable(InputStream sharedStringsTableInputStream,
- XlsxReadWorkbookHolder xlsxReadWorkbookHolder) throws Exception {
+ XlsxReadWorkbookHolder xlsxReadWorkbookHolder) {
  ContentHandler handler = new SharedStringsTableHandler(xlsxReadWorkbookHolder.getReadCache());
  parseXmlSource(sharedStringsTableInputStream, handler);
  xlsxReadWorkbookHolder.getReadCache().putFinished();
@@ -201,7 +199,7 @@ private OPCPackage readOpcPackage(XlsxReadWorkbookHolder xlsxReadWorkbookHolder,
  }
  File readTempFile = FileUtils.createCacheTmpFile();
  xlsxReadWorkbookHolder.setTempFile(readTempFile);
- File tempFile = new File(readTempFile.getPath(), UUID.randomUUID().toString() + ".xlsx");
+ File tempFile = new File(readTempFile.getPath(), UUID.randomUUID() + ".xlsx");
  if (decryptedStream != null) {
  FileUtils.writeToFile(tempFile, decryptedStream, false);
  } else {

easyexcel-core/src/main/java/com/alibaba/excel/metadata/csv/CsvCell.java

@@ -227,11 +227,6 @@ public CellType getCachedFormulaResultType() {
  return getCellType();
  }
 
- @Override
- public CellType getCachedFormulaResultTypeEnum() {
- return getCellType();
- }
-
  @Override
  public String getCellFormula() {
  if (formulaData == null) {

easyexcel-core/src/main/java/com/alibaba/excel/metadata/csv/CsvCellStyle.java

@@ -76,7 +76,7 @@ public void setFont(Font font) {
  }
 
  @Override
- public short getFontIndex() {
+ public int getFontIndex() {
  return 0;
  }
 
@@ -125,11 +125,6 @@ public HorizontalAlignment getAlignment() {
  return null;
  }
 
- @Override
- public HorizontalAlignment getAlignmentEnum() {
- return null;
- }
-
  @Override
  public void setWrapText(boolean wrapped) {
 
@@ -150,11 +145,6 @@ public VerticalAlignment getVerticalAlignment() {
  return null;
  }
 
- @Override
- public VerticalAlignment getVerticalAlignmentEnum() {
- return null;
- }
-
  @Override
  public void setRotation(short rotation) {
 
@@ -185,11 +175,6 @@ public BorderStyle getBorderLeft() {
  return null;
  }
 
- @Override
- public BorderStyle getBorderLeftEnum() {
- return null;
- }
-
  @Override
  public void setBorderRight(BorderStyle border) {
 
@@ -200,11 +185,6 @@ public BorderStyle getBorderRight() {
  return null;
  }
 
- @Override
- public BorderStyle getBorderRightEnum() {
- return null;
- }
-
  @Override
  public void setBorderTop(BorderStyle border) {
 
@@ -215,11 +195,6 @@ public BorderStyle getBorderTop() {
  return null;
  }
 
- @Override
- public BorderStyle getBorderTopEnum() {
- return null;
- }
-
  @Override
  public void setBorderBottom(BorderStyle border) {
 
@@ -230,11 +205,6 @@ public BorderStyle getBorderBottom() {
  return null;
  }
 
- @Override
- public BorderStyle getBorderBottomEnum() {
- return null;
- }
-
  @Override
  public void setLeftBorderColor(short color) {
 
@@ -286,12 +256,12 @@ public FillPatternType getFillPattern() {
  }
 
  @Override
- public FillPatternType getFillPatternEnum() {
- return null;
+ public void setFillBackgroundColor(short bg) {
+
  }
 
  @Override
- public void setFillBackgroundColor(short bg) {
+ public void setFillBackgroundColor(Color color) {
 
  }
 
@@ -310,6 +280,11 @@ public void setFillForegroundColor(short bg) {
 
  }
 
+ @Override
+ public void setFillForegroundColor(Color color) {
+
+ }
+
  @Override
  public short getFillForegroundColor() {
  return 0;

easyexcel-core/src/main/java/com/alibaba/excel/metadata/csv/CsvSheet.java

@@ -34,6 +34,8 @@
 import org.apache.poi.ss.usermodel.Footer;
 import org.apache.poi.ss.usermodel.Header;
 import org.apache.poi.ss.usermodel.Hyperlink;
+import org.apache.poi.ss.usermodel.PageMargin;
+import org.apache.poi.ss.usermodel.PaneType;
 import org.apache.poi.ss.usermodel.PrintSetup;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
@@ -406,11 +408,21 @@ public double getMargin(short margin) {
  return 0;
  }
 
+ @Override
+ public double getMargin(PageMargin pageMargin) {
+ return 0;
+ }
+
  @Override
  public void setMargin(short margin, double size) {
 
  }
 
+ @Override
+ public void setMargin(PageMargin pageMargin, double v) {
+
+ }
+
  @Override
  public boolean getProtect() {
  return false;
@@ -476,6 +488,11 @@ public void createSplitPane(int xSplitPos, int ySplitPos, int leftmostColumn, in
 
  }
 
+ @Override
+ public void createSplitPane(int i, int i1, int i2, int i3, PaneType paneType) {
+
+ }
+
  @Override
  public PaneInformation getPaneInformation() {
  return null;

easyexcel-core/src/main/java/com/alibaba/excel/metadata/csv/CsvWorkbook.java

@@ -12,7 +12,9 @@
 import lombok.Setter;
 import org.apache.commons.compress.utils.Lists;
 import org.apache.poi.ss.SpreadsheetVersion;
+import org.apache.poi.ss.formula.EvaluationWorkbook;
 import org.apache.poi.ss.formula.udf.UDFFinder;
+import org.apache.poi.ss.usermodel.CellReferenceType;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.CreationHelper;
 import org.apache.poi.ss.usermodel.DataFormat;
@@ -40,10 +42,9 @@ public class CsvWorkbook implements Workbook {
 
  /**
  * true if date uses 1904 windowing, or false if using 1900 date windowing.
- *
+ * <p>
  * default is false
  *
- * @return
  */
  private Boolean use1904windowing;
 
@@ -54,7 +55,7 @@ public class CsvWorkbook implements Workbook {
 
  /**
  * Whether to use scientific Format.
- *
+ * <p>
  * default is false
  */
  private Boolean useScientificFormat;
@@ -200,7 +201,7 @@ public Font findFont(boolean bold, short color, short fontHeight, String name, b
  }
 
  @Override
- public short getNumberOfFonts() {
+ public int getNumberOfFonts() {
  return 0;
  }
 
@@ -209,11 +210,6 @@ public int getNumberOfFontsAsInt() {
  return 0;
  }
 
- @Override
- public Font getFontAt(short idx) {
- return null;
- }
-
  @Override
  public Font getFontAt(int idx) {
  return null;
@@ -272,31 +268,11 @@ public List<? extends Name> getAllNames() {
  return null;
  }
 
- @Override
- public Name getNameAt(int nameIndex) {
- return null;
- }
-
  @Override
  public Name createName() {
  return null;
  }
 
- @Override
- public int getNameIndex(String name) {
- return 0;
- }
-
- @Override
- public void removeName(int index) {
-
- }
-
- @Override
- public void removeName(String name) {
-
- }
-
  @Override
  public void removeName(Name name) {
 
@@ -417,10 +393,25 @@ public SpreadsheetVersion getSpreadsheetVersion() {
  }
 
  @Override
- public int addOlePackage(byte[] oleData, String label, String fileName, String command) throws IOException {
+ public int addOlePackage(byte[] oleData, String label, String fileName, String command) {
  return 0;
  }
 
+ @Override
+ public EvaluationWorkbook createEvaluationWorkbook() {
+ return null;
+ }
+
+ @Override
+ public CellReferenceType getCellReferenceType() {
+ return null;
+ }
+
+ @Override
+ public void setCellReferenceType(CellReferenceType cellReferenceType) {
+
+ }
+
  @Override
  public Iterator<Sheet> iterator() {
  return null;