diff --git a/src/main/java/com/taover/easyexcel/event/SyncReadAllListener.java b/src/main/java/com/taover/easyexcel/event/SyncReadAllListener.java deleted file mode 100644 index 49f9fba..0000000 --- a/src/main/java/com/taover/easyexcel/event/SyncReadAllListener.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.taover.easyexcel.event; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import com.taover.easyexcel.context.AnalysisContext; - -/** - * Synchronous data reading - * - * @author wangbin - */ -public class SyncReadAllListener extends AnalysisEventListener> { - private int currSheetIndex = 0; - private Map>> sheetMap = new HashMap>>(); - - @Override - public void invoke(Map data, AnalysisContext context) { - List> sheetData = sheetMap.get(currSheetIndex); - if(sheetData == null) { - sheetData = new ArrayList>(); - } - sheetData.add((Map)data); - this.sheetMap.put(this.currSheetIndex, sheetData); - } - - @Override - public void doAfterAllAnalysed(AnalysisContext context) { - ++this.currSheetIndex; - } - - public Map>> getSheetMap() { - return this.sheetMap; - } -} diff --git a/src/main/java/com/taover/easyexcel/event/SyncReadAllSheetToMapListener.java b/src/main/java/com/taover/easyexcel/event/SyncReadAllSheetToMapListener.java new file mode 100644 index 0000000..49ecf15 --- /dev/null +++ b/src/main/java/com/taover/easyexcel/event/SyncReadAllSheetToMapListener.java @@ -0,0 +1,37 @@ +package com.taover.easyexcel.event; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import com.taover.easyexcel.context.AnalysisContext; + +/** + * Synchronous data reading + * + * @author wangbin + */ +public class SyncReadAllSheetToMapListener extends AnalysisEventListener> { + private int currSheetIndex = 0; + private Map>> sheetMap = new HashMap>>(); + + @Override + public void invoke(Map data, AnalysisContext context) { + List> sheetData = sheetMap.get(currSheetIndex); + if(sheetData == null) { + sheetData = new ArrayList>(); + } + sheetData.add((Map)data); + this.sheetMap.put(this.currSheetIndex, sheetData); + } + + @Override + public void doAfterAllAnalysed(AnalysisContext context) { + ++this.currSheetIndex; + } + + public Map>> getSheetMap() { + return this.sheetMap; + } +} diff --git a/src/main/java/com/taover/easyexcel/read/builder/ExcelReaderBuilder.java b/src/main/java/com/taover/easyexcel/read/builder/ExcelReaderBuilder.java index a37bc38..5c81390 100644 --- a/src/main/java/com/taover/easyexcel/read/builder/ExcelReaderBuilder.java +++ b/src/main/java/com/taover/easyexcel/read/builder/ExcelReaderBuilder.java @@ -14,7 +14,7 @@ import com.taover.easyexcel.cache.selector.ReadCacheSelector; import com.taover.easyexcel.context.AnalysisContext; import com.taover.easyexcel.enums.CellExtraTypeEnum; import com.taover.easyexcel.event.AnalysisEventListener; -import com.taover.easyexcel.event.SyncReadAllListener; +import com.taover.easyexcel.event.SyncReadAllSheetToMapListener; import com.taover.easyexcel.event.SyncReadListener; import com.taover.easyexcel.read.listener.ModelBuildEventListener; import com.taover.easyexcel.read.metadata.ReadWorkbook; @@ -221,7 +221,7 @@ public class ExcelReaderBuilder extends AbstractExcelReaderParameterBuilder>> doReadAllSyncForMap() { - SyncReadAllListener syncReadListener = new SyncReadAllListener(); + SyncReadAllSheetToMapListener syncReadListener = new SyncReadAllSheetToMapListener(); registerReadListener(syncReadListener); ExcelReader excelReader = build(); excelReader.readAll(); diff --git a/src/main/java/com/taover/easyexcel/read/builder/ExcelReaderSheetBuilder.java b/src/main/java/com/taover/easyexcel/read/builder/ExcelReaderSheetBuilder.java index f50ddbd..3d8ffc1 100644 --- a/src/main/java/com/taover/easyexcel/read/builder/ExcelReaderSheetBuilder.java +++ b/src/main/java/com/taover/easyexcel/read/builder/ExcelReaderSheetBuilder.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Map; import com.taover.easyexcel.ExcelReader; -import com.taover.easyexcel.event.SyncReadAllListener; +import com.taover.easyexcel.event.SyncReadAllSheetToMapListener; import com.taover.easyexcel.event.SyncReadListener; import com.taover.easyexcel.exception.ExcelAnalysisException; import com.taover.easyexcel.exception.ExcelGenerateException; -- libgit2 0.21.2