不使用弃用代码

alibaba · Apr 9, 2021 · 6316eda · 6316eda
1 parent 3ca7cf4
commit 6316eda
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 56 deletions.
diff --git a/src/main/java/com/alibaba/excel/write/handler/CellWriteHandler.java b/src/main/java/com/alibaba/excel/write/handler/CellWriteHandler.java
@@ -2,14 +2,14 @@
 
 import java.util.List;
 
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-
 import com.alibaba.excel.metadata.CellData;
 import com.alibaba.excel.metadata.Head;
 import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
 import com.alibaba.excel.write.metadata.holder.WriteTableHolder;
 
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+
 /**
  * intercepts handle cell creation
  *
@@ -21,72 +21,54 @@ public interface CellWriteHandler extends WriteHandler {
      * Called before create the cell
      *
      * @param writeSheetHolder
-     * @param writeTableHolder
-     *            Nullable.It is null without using table writes.
+     * @param writeTableHolder Nullable.It is null without using table writes.
      * @param row
-     * @param head
-     *            Nullable.It is null in the case of fill data and without head.
+     * @param head             Nullable.It is null in the case of fill data and without head.
      * @param columnIndex
-     * @param relativeRowIndex
-     *            Nullable.It is null in the case of fill data.
-     * @param isHead
-     *            It will always be false when fill data.
+     * @param relativeRowIndex Nullable.It is null in the case of fill data.
+     * @param isHead           It will always be false when fill data.
      */
-    void beforeCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, Row row, Head head,
-        Integer columnIndex, Integer relativeRowIndex, Boolean isHead);
+    default void beforeCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, Row row,
+        Head head, Integer columnIndex, Integer relativeRowIndex, Boolean isHead) {}
 
     /**
      * Called after the cell is created
      *
      * @param writeSheetHolder
-     * @param writeTableHolder
-     *            Nullable.It is null without using table writes.
+     * @param writeTableHolder Nullable.It is null without using table writes.
      * @param cell
-     * @param head
-     *            Nullable.It is null in the case of fill data and without head.
-     * @param relativeRowIndex
-     *            Nullable.It is null in the case of fill data.
-     * @param isHead
-     *            It will always be false when fill data.
+     * @param head             Nullable.It is null in the case of fill data and without head.
+     * @param relativeRowIndex Nullable.It is null in the case of fill data.
+     * @param isHead           It will always be false when fill data.
      */
-    void afterCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, Cell cell, Head head,
-        Integer relativeRowIndex, Boolean isHead);
+    default void afterCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, Cell cell,
+        Head head, Integer relativeRowIndex, Boolean isHead) {}
 
     /**
      * Called after the cell data is converted
      *
      * @param writeSheetHolder
-     * @param writeTableHolder
-     *            Nullable.It is null without using table writes.
+     * @param writeTableHolder Nullable.It is null without using table writes.
      * @param cell
-     * @param head
-     *            Nullable.It is null in the case of fill data and without head.
-     * @param cellData
-     *            Nullable.It is null in the case of add header.
-     * @param relativeRowIndex
-     *            Nullable.It is null in the case of fill data.
-     * @param isHead
-     *            It will always be false when fill data.
+     * @param head             Nullable.It is null in the case of fill data and without head.
+     * @param cellData         Nullable.It is null in the case of add header.
+     * @param relativeRowIndex Nullable.It is null in the case of fill data.
+     * @param isHead           It will always be false when fill data.
      */
-    void afterCellDataConverted(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, CellData cellData,
-        Cell cell, Head head, Integer relativeRowIndex, Boolean isHead);
+    default void afterCellDataConverted(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder,
+        CellData cellData, Cell cell, Head head, Integer relativeRowIndex, Boolean isHead) {}
 
     /**
      * Called after all operations on the cell have been completed
      *
      * @param writeSheetHolder
-     * @param writeTableHolder
-     *            Nullable.It is null without using table writes.
+     * @param writeTableHolder Nullable.It is null without using table writes.
      * @param cell
-     * @param head
-     *            Nullable.It is null in the case of fill data and without head.
-     * @param cellDataList
-     *            Nullable.It is null in the case of add header.There may be several when fill the data.
-     * @param relativeRowIndex
-     *            Nullable.It is null in the case of fill data.
-     * @param isHead
-     *            It will always be false when fill data.
+     * @param head             Nullable.It is null in the case of fill data and without head.
+     * @param cellDataList     Nullable.It is null in the case of add header.There may be several when fill the data.
+     * @param relativeRowIndex Nullable.It is null in the case of fill data.
+     * @param isHead           It will always be false when fill data.
      */
-    void afterCellDispose(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder,
-        List<CellData> cellDataList, Cell cell, Head head, Integer relativeRowIndex, Boolean isHead);
+    default void afterCellDispose(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder,
+        List<CellData> cellDataList, Cell cell, Head head, Integer relativeRowIndex, Boolean isHead) {}
 }
diff --git a/src/main/java/com/alibaba/excel/write/handler/SheetWriteHandler.java b/src/main/java/com/alibaba/excel/write/handler/SheetWriteHandler.java
@@ -16,13 +16,13 @@ public interface SheetWriteHandler extends WriteHandler {
      * @param writeWorkbookHolder
      * @param writeSheetHolder
      */
-    void beforeSheetCreate(WriteWorkbookHolder writeWorkbookHolder, WriteSheetHolder writeSheetHolder);
+    default void beforeSheetCreate(WriteWorkbookHolder writeWorkbookHolder, WriteSheetHolder writeSheetHolder) {}
 
     /**
      * Called after the sheet is created
      *
      * @param writeWorkbookHolder
      * @param writeSheetHolder
      */
-    void afterSheetCreate(WriteWorkbookHolder writeWorkbookHolder, WriteSheetHolder writeSheetHolder);
+    default void afterSheetCreate(WriteWorkbookHolder writeWorkbookHolder, WriteSheetHolder writeSheetHolder) {}
 }
diff --git a/src/main/java/com/alibaba/excel/write/merge/LoopMergeStrategy.java b/src/main/java/com/alibaba/excel/write/merge/LoopMergeStrategy.java
@@ -5,6 +5,7 @@
 
 import com.alibaba.excel.metadata.property.LoopMergeProperty;
 import com.alibaba.excel.write.handler.AbstractRowWriteHandler;
+import com.alibaba.excel.write.handler.RowWriteHandler;
 import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
 import com.alibaba.excel.write.metadata.holder.WriteTableHolder;
 
@@ -13,7 +14,7 @@
  *
  * @author Jiaju Zhuang
  */
-public class LoopMergeStrategy extends AbstractRowWriteHandler {
+public class LoopMergeStrategy implements RowWriteHandler {
     /**
      * Each row
      */

diff --git a/src/main/java/com/alibaba/excel/write/merge/OnceAbsoluteMergeStrategy.java b/src/main/java/com/alibaba/excel/write/merge/OnceAbsoluteMergeStrategy.java
@@ -4,6 +4,7 @@
 
 import com.alibaba.excel.metadata.property.OnceAbsoluteMergeProperty;
 import com.alibaba.excel.write.handler.AbstractSheetWriteHandler;
+import com.alibaba.excel.write.handler.SheetWriteHandler;
 import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
 import com.alibaba.excel.write.metadata.holder.WriteWorkbookHolder;
 
@@ -12,7 +13,7 @@
  *
  * @author Jiaju Zhuang
  */
-public class OnceAbsoluteMergeStrategy extends AbstractSheetWriteHandler {
+public class OnceAbsoluteMergeStrategy implements SheetWriteHandler {
     /**
      * First row
      */

diff --git a/src/main/java/com/alibaba/excel/write/style/column/AbstractColumnWidthStyleStrategy.java b/src/main/java/com/alibaba/excel/write/style/column/AbstractColumnWidthStyleStrategy.java
@@ -8,6 +8,7 @@
 import com.alibaba.excel.metadata.CellData;
 import com.alibaba.excel.metadata.Head;
 import com.alibaba.excel.write.handler.AbstractCellWriteHandler;
+import com.alibaba.excel.write.handler.CellWriteHandler;
 import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
 import com.alibaba.excel.write.metadata.holder.WriteTableHolder;
 
@@ -16,7 +17,7 @@
  *
  * @author Jiaju Zhuang
  */
-public abstract class AbstractColumnWidthStyleStrategy extends AbstractCellWriteHandler implements NotRepeatExecutor {
+public abstract class AbstractColumnWidthStyleStrategy implements CellWriteHandler,NotRepeatExecutor {
 
     @Override
     public String uniqueValue() {

diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/write/CommentWriteHandler.java b/src/test/java/com/alibaba/easyexcel/test/demo/write/CommentWriteHandler.java
@@ -8,6 +8,7 @@
 import org.apache.poi.xssf.usermodel.XSSFRichTextString;
 
 import com.alibaba.excel.write.handler.AbstractRowWriteHandler;
+import com.alibaba.excel.write.handler.RowWriteHandler;
 import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
 import com.alibaba.excel.write.metadata.holder.WriteTableHolder;
 
@@ -16,7 +17,7 @@
  *
  * @author Jiaju Zhuang
  */
-public class CommentWriteHandler extends AbstractRowWriteHandler {
+public class CommentWriteHandler implements RowWriteHandler {
 
     @Override
     public void afterRowDispose(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, Row row,

diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/write/CustomCellWriteHandler.java b/src/test/java/com/alibaba/easyexcel/test/demo/write/CustomCellWriteHandler.java
@@ -12,6 +12,7 @@
 import com.alibaba.excel.metadata.CellData;
 import com.alibaba.excel.metadata.Head;
 import com.alibaba.excel.write.handler.AbstractCellWriteHandler;
+import com.alibaba.excel.write.handler.CellWriteHandler;
 import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
 import com.alibaba.excel.write.metadata.holder.WriteTableHolder;
 
@@ -20,7 +21,7 @@
  *
  * @author Jiaju Zhuang
  */
-public class CustomCellWriteHandler extends AbstractCellWriteHandler {
+public class CustomCellWriteHandler implements CellWriteHandler {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(CustomCellWriteHandler.class);
 

diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/simple/WriteCellHandler.java b/src/test/java/com/alibaba/easyexcel/test/temp/simple/WriteCellHandler.java
@@ -3,6 +3,7 @@
 import com.alibaba.excel.metadata.CellData;
 import com.alibaba.excel.metadata.Head;
 import com.alibaba.excel.write.handler.AbstractCellWriteHandler;
+import com.alibaba.excel.write.handler.CellWriteHandler;
 import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
 import com.alibaba.excel.write.metadata.holder.WriteTableHolder;
 
@@ -17,7 +18,7 @@
  * @author Jiaju Zhuang
  */
 @Slf4j
-public class WriteCellHandler extends AbstractCellWriteHandler {
+public class WriteCellHandler implements CellWriteHandler {
 
     @Override
     public void afterCellDataConverted(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder,

diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/simple/WriteHandler.java b/src/test/java/com/alibaba/easyexcel/test/temp/simple/WriteHandler.java
@@ -1,6 +1,7 @@
 package com.alibaba.easyexcel.test.temp.simple;
 
 import com.alibaba.excel.write.handler.AbstractSheetWriteHandler;
+import com.alibaba.excel.write.handler.SheetWriteHandler;
 import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
 import com.alibaba.excel.write.metadata.holder.WriteWorkbookHolder;
 
@@ -10,7 +11,7 @@
  * @author Jiaju Zhuang
  */
 @Slf4j
-public class WriteHandler extends AbstractSheetWriteHandler {
+public class WriteHandler implements SheetWriteHandler {
 
     @Override
     public void afterSheetCreate(WriteWorkbookHolder writeWorkbookHolder,