Browse Source

不使用弃用代码

pull/2074/head
Jiaju Zhuang 4 years ago
parent
commit
6316eda958
  1. 76
      src/main/java/com/alibaba/excel/write/handler/CellWriteHandler.java
  2. 4
      src/main/java/com/alibaba/excel/write/handler/SheetWriteHandler.java
  3. 3
      src/main/java/com/alibaba/excel/write/merge/LoopMergeStrategy.java
  4. 3
      src/main/java/com/alibaba/excel/write/merge/OnceAbsoluteMergeStrategy.java
  5. 3
      src/main/java/com/alibaba/excel/write/style/column/AbstractColumnWidthStyleStrategy.java
  6. 3
      src/test/java/com/alibaba/easyexcel/test/demo/write/CommentWriteHandler.java
  7. 3
      src/test/java/com/alibaba/easyexcel/test/demo/write/CustomCellWriteHandler.java
  8. 3
      src/test/java/com/alibaba/easyexcel/test/temp/simple/WriteCellHandler.java
  9. 3
      src/test/java/com/alibaba/easyexcel/test/temp/simple/WriteHandler.java

76
src/main/java/com/alibaba/excel/write/handler/CellWriteHandler.java

@ -2,14 +2,14 @@ package com.alibaba.excel.write.handler;
import java.util.List; 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.CellData;
import com.alibaba.excel.metadata.Head; import com.alibaba.excel.metadata.Head;
import com.alibaba.excel.write.metadata.holder.WriteSheetHolder; import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
import com.alibaba.excel.write.metadata.holder.WriteTableHolder; 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 * intercepts handle cell creation
* *
@ -21,72 +21,54 @@ public interface CellWriteHandler extends WriteHandler {
* Called before create the cell * Called before create the cell
* *
* @param writeSheetHolder * @param writeSheetHolder
* @param writeTableHolder * @param writeTableHolder Nullable.It is null without using table writes.
* Nullable.It is null without using table writes.
* @param row * @param row
* @param head * @param head Nullable.It is null in the case of fill data and without head.
* Nullable.It is null in the case of fill data and without head.
* @param columnIndex * @param columnIndex
* @param relativeRowIndex * @param relativeRowIndex Nullable.It is null in the case of fill data.
* Nullable.It is null in the case of fill data. * @param isHead It will always be false when fill data.
* @param isHead
* It will always be false when fill data.
*/ */
void beforeCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, Row row, Head head, default void beforeCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, Row row,
Integer columnIndex, Integer relativeRowIndex, Boolean isHead); Head head, Integer columnIndex, Integer relativeRowIndex, Boolean isHead) {}
/** /**
* Called after the cell is created * Called after the cell is created
* *
* @param writeSheetHolder * @param writeSheetHolder
* @param writeTableHolder * @param writeTableHolder Nullable.It is null without using table writes.
* Nullable.It is null without using table writes.
* @param cell * @param cell
* @param head * @param head Nullable.It is null in the case of fill data and without 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 relativeRowIndex * @param isHead It will always be false when fill data.
* 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, default void afterCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, Cell cell,
Integer relativeRowIndex, Boolean isHead); Head head, Integer relativeRowIndex, Boolean isHead) {}
/** /**
* Called after the cell data is converted * Called after the cell data is converted
* *
* @param writeSheetHolder * @param writeSheetHolder
* @param writeTableHolder * @param writeTableHolder Nullable.It is null without using table writes.
* Nullable.It is null without using table writes.
* @param cell * @param cell
* @param head * @param head Nullable.It is null in the case of fill data and without 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 cellData * @param relativeRowIndex Nullable.It is null in the case of fill data.
* Nullable.It is null in the case of add header. * @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 afterCellDataConverted(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, CellData cellData, default void afterCellDataConverted(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder,
Cell cell, Head head, Integer relativeRowIndex, Boolean isHead); CellData cellData, Cell cell, Head head, Integer relativeRowIndex, Boolean isHead) {}
/** /**
* Called after all operations on the cell have been completed * Called after all operations on the cell have been completed
* *
* @param writeSheetHolder * @param writeSheetHolder
* @param writeTableHolder * @param writeTableHolder Nullable.It is null without using table writes.
* Nullable.It is null without using table writes.
* @param cell * @param cell
* @param head * @param head Nullable.It is null in the case of fill data and without 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 cellDataList * @param relativeRowIndex Nullable.It is null in the case of fill data.
* Nullable.It is null in the case of add header.There may be several when fill the 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 afterCellDispose(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, default void afterCellDispose(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder,
List<CellData> cellDataList, Cell cell, Head head, Integer relativeRowIndex, Boolean isHead); List<CellData> cellDataList, Cell cell, Head head, Integer relativeRowIndex, Boolean isHead) {}
} }

4
src/main/java/com/alibaba/excel/write/handler/SheetWriteHandler.java

@ -16,7 +16,7 @@ public interface SheetWriteHandler extends WriteHandler {
* @param writeWorkbookHolder * @param writeWorkbookHolder
* @param writeSheetHolder * @param writeSheetHolder
*/ */
void beforeSheetCreate(WriteWorkbookHolder writeWorkbookHolder, WriteSheetHolder writeSheetHolder); default void beforeSheetCreate(WriteWorkbookHolder writeWorkbookHolder, WriteSheetHolder writeSheetHolder) {}
/** /**
* Called after the sheet is created * Called after the sheet is created
@ -24,5 +24,5 @@ public interface SheetWriteHandler extends WriteHandler {
* @param writeWorkbookHolder * @param writeWorkbookHolder
* @param writeSheetHolder * @param writeSheetHolder
*/ */
void afterSheetCreate(WriteWorkbookHolder writeWorkbookHolder, WriteSheetHolder writeSheetHolder); default void afterSheetCreate(WriteWorkbookHolder writeWorkbookHolder, WriteSheetHolder writeSheetHolder) {}
} }

3
src/main/java/com/alibaba/excel/write/merge/LoopMergeStrategy.java

@ -5,6 +5,7 @@ import org.apache.poi.ss.util.CellRangeAddress;
import com.alibaba.excel.metadata.property.LoopMergeProperty; import com.alibaba.excel.metadata.property.LoopMergeProperty;
import com.alibaba.excel.write.handler.AbstractRowWriteHandler; 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.WriteSheetHolder;
import com.alibaba.excel.write.metadata.holder.WriteTableHolder; import com.alibaba.excel.write.metadata.holder.WriteTableHolder;
@ -13,7 +14,7 @@ import com.alibaba.excel.write.metadata.holder.WriteTableHolder;
* *
* @author Jiaju Zhuang * @author Jiaju Zhuang
*/ */
public class LoopMergeStrategy extends AbstractRowWriteHandler { public class LoopMergeStrategy implements RowWriteHandler {
/** /**
* Each row * Each row
*/ */

3
src/main/java/com/alibaba/excel/write/merge/OnceAbsoluteMergeStrategy.java

@ -4,6 +4,7 @@ import org.apache.poi.ss.util.CellRangeAddress;
import com.alibaba.excel.metadata.property.OnceAbsoluteMergeProperty; import com.alibaba.excel.metadata.property.OnceAbsoluteMergeProperty;
import com.alibaba.excel.write.handler.AbstractSheetWriteHandler; 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.WriteSheetHolder;
import com.alibaba.excel.write.metadata.holder.WriteWorkbookHolder; import com.alibaba.excel.write.metadata.holder.WriteWorkbookHolder;
@ -12,7 +13,7 @@ import com.alibaba.excel.write.metadata.holder.WriteWorkbookHolder;
* *
* @author Jiaju Zhuang * @author Jiaju Zhuang
*/ */
public class OnceAbsoluteMergeStrategy extends AbstractSheetWriteHandler { public class OnceAbsoluteMergeStrategy implements SheetWriteHandler {
/** /**
* First row * First row
*/ */

3
src/main/java/com/alibaba/excel/write/style/column/AbstractColumnWidthStyleStrategy.java

@ -8,6 +8,7 @@ import com.alibaba.excel.event.NotRepeatExecutor;
import com.alibaba.excel.metadata.CellData; import com.alibaba.excel.metadata.CellData;
import com.alibaba.excel.metadata.Head; import com.alibaba.excel.metadata.Head;
import com.alibaba.excel.write.handler.AbstractCellWriteHandler; 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.WriteSheetHolder;
import com.alibaba.excel.write.metadata.holder.WriteTableHolder; import com.alibaba.excel.write.metadata.holder.WriteTableHolder;
@ -16,7 +17,7 @@ import com.alibaba.excel.write.metadata.holder.WriteTableHolder;
* *
* @author Jiaju Zhuang * @author Jiaju Zhuang
*/ */
public abstract class AbstractColumnWidthStyleStrategy extends AbstractCellWriteHandler implements NotRepeatExecutor { public abstract class AbstractColumnWidthStyleStrategy implements CellWriteHandler,NotRepeatExecutor {
@Override @Override
public String uniqueValue() { public String uniqueValue() {

3
src/test/java/com/alibaba/easyexcel/test/demo/write/CommentWriteHandler.java

@ -8,6 +8,7 @@ import org.apache.poi.xssf.usermodel.XSSFClientAnchor;
import org.apache.poi.xssf.usermodel.XSSFRichTextString; import org.apache.poi.xssf.usermodel.XSSFRichTextString;
import com.alibaba.excel.write.handler.AbstractRowWriteHandler; 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.WriteSheetHolder;
import com.alibaba.excel.write.metadata.holder.WriteTableHolder; import com.alibaba.excel.write.metadata.holder.WriteTableHolder;
@ -16,7 +17,7 @@ import com.alibaba.excel.write.metadata.holder.WriteTableHolder;
* *
* @author Jiaju Zhuang * @author Jiaju Zhuang
*/ */
public class CommentWriteHandler extends AbstractRowWriteHandler { public class CommentWriteHandler implements RowWriteHandler {
@Override @Override
public void afterRowDispose(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, Row row, public void afterRowDispose(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, Row row,

3
src/test/java/com/alibaba/easyexcel/test/demo/write/CustomCellWriteHandler.java

@ -12,6 +12,7 @@ import org.slf4j.LoggerFactory;
import com.alibaba.excel.metadata.CellData; import com.alibaba.excel.metadata.CellData;
import com.alibaba.excel.metadata.Head; import com.alibaba.excel.metadata.Head;
import com.alibaba.excel.write.handler.AbstractCellWriteHandler; 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.WriteSheetHolder;
import com.alibaba.excel.write.metadata.holder.WriteTableHolder; import com.alibaba.excel.write.metadata.holder.WriteTableHolder;
@ -20,7 +21,7 @@ import com.alibaba.excel.write.metadata.holder.WriteTableHolder;
* *
* @author Jiaju Zhuang * @author Jiaju Zhuang
*/ */
public class CustomCellWriteHandler extends AbstractCellWriteHandler { public class CustomCellWriteHandler implements CellWriteHandler {
private static final Logger LOGGER = LoggerFactory.getLogger(CustomCellWriteHandler.class); private static final Logger LOGGER = LoggerFactory.getLogger(CustomCellWriteHandler.class);

3
src/test/java/com/alibaba/easyexcel/test/temp/simple/WriteCellHandler.java

@ -3,6 +3,7 @@ package com.alibaba.easyexcel.test.temp.simple;
import com.alibaba.excel.metadata.CellData; import com.alibaba.excel.metadata.CellData;
import com.alibaba.excel.metadata.Head; import com.alibaba.excel.metadata.Head;
import com.alibaba.excel.write.handler.AbstractCellWriteHandler; 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.WriteSheetHolder;
import com.alibaba.excel.write.metadata.holder.WriteTableHolder; import com.alibaba.excel.write.metadata.holder.WriteTableHolder;
@ -17,7 +18,7 @@ import org.apache.poi.ss.usermodel.IndexedColors;
* @author Jiaju Zhuang * @author Jiaju Zhuang
*/ */
@Slf4j @Slf4j
public class WriteCellHandler extends AbstractCellWriteHandler { public class WriteCellHandler implements CellWriteHandler {
@Override @Override
public void afterCellDataConverted(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, public void afterCellDataConverted(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder,

3
src/test/java/com/alibaba/easyexcel/test/temp/simple/WriteHandler.java

@ -1,6 +1,7 @@
package com.alibaba.easyexcel.test.temp.simple; package com.alibaba.easyexcel.test.temp.simple;
import com.alibaba.excel.write.handler.AbstractSheetWriteHandler; 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.WriteSheetHolder;
import com.alibaba.excel.write.metadata.holder.WriteWorkbookHolder; import com.alibaba.excel.write.metadata.holder.WriteWorkbookHolder;
@ -10,7 +11,7 @@ import lombok.extern.slf4j.Slf4j;
* @author Jiaju Zhuang * @author Jiaju Zhuang
*/ */
@Slf4j @Slf4j
public class WriteHandler extends AbstractSheetWriteHandler { public class WriteHandler implements SheetWriteHandler {
@Override @Override
public void afterSheetCreate(WriteWorkbookHolder writeWorkbookHolder, public void afterSheetCreate(WriteWorkbookHolder writeWorkbookHolder,

Loading…
Cancel
Save