diff --git a/src/main/java/com/alibaba/excel/analysis/v07/XlsxSaxAnalyser.java b/src/main/java/com/alibaba/excel/analysis/v07/XlsxSaxAnalyser.java index 329f5250..ea8b87b1 100644 --- a/src/main/java/com/alibaba/excel/analysis/v07/XlsxSaxAnalyser.java +++ b/src/main/java/com/alibaba/excel/analysis/v07/XlsxSaxAnalyser.java @@ -86,9 +86,9 @@ public class XlsxSaxAnalyser implements ExcelReadExecutor { // set style table setStylesTable(xlsxReadWorkbookHolder, xssfReader); - sheetList = new ArrayList(); - sheetMap = new HashMap(); - commentsTableMap = new HashMap(); + sheetList = new ArrayList<>(); + sheetMap = new HashMap<>(); + commentsTableMap = new HashMap<>(); XSSFReader.SheetIterator ite = (XSSFReader.SheetIterator)xssfReader.getSheetsData(); int index = 0; if (!ite.hasNext()) { diff --git a/src/main/java/com/alibaba/excel/read/metadata/holder/xlsx/XlsxReadSheetHolder.java b/src/main/java/com/alibaba/excel/read/metadata/holder/xlsx/XlsxReadSheetHolder.java index 46b92818..b29ba455 100644 --- a/src/main/java/com/alibaba/excel/read/metadata/holder/xlsx/XlsxReadSheetHolder.java +++ b/src/main/java/com/alibaba/excel/read/metadata/holder/xlsx/XlsxReadSheetHolder.java @@ -7,11 +7,14 @@ import com.alibaba.excel.read.metadata.ReadSheet; import com.alibaba.excel.read.metadata.holder.ReadSheetHolder; import com.alibaba.excel.read.metadata.holder.ReadWorkbookHolder; +import lombok.Data; + /** * sheet holder * * @author Jiaju Zhuang */ +@Data public class XlsxReadSheetHolder extends ReadSheetHolder { /** * Record the label of the current operation to prevent NPE. @@ -34,36 +37,4 @@ public class XlsxReadSheetHolder extends ReadSheetHolder { super(readSheet, readWorkbookHolder); this.tagDeque = new LinkedList(); } - - public Deque getTagDeque() { - return tagDeque; - } - - public void setTagDeque(Deque tagDeque) { - this.tagDeque = tagDeque; - } - - public Integer getColumnIndex() { - return columnIndex; - } - - public void setColumnIndex(Integer columnIndex) { - this.columnIndex = columnIndex; - } - - public StringBuilder getTempData() { - return tempData; - } - - public void setTempData(StringBuilder tempData) { - this.tempData = tempData; - } - - public StringBuilder getTempFormula() { - return tempFormula; - } - - public void setTempFormula(StringBuilder tempFormula) { - this.tempFormula = tempFormula; - } }