Merge pull request #1424 from alibaba/developing

Developing

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.alibaba</groupId>
     <artifactId>easyexcel</artifactId>
-    <version>2.2.5</version>
+    <version>2.2.6</version>
     <packaging>jar</packaging>
     <name>easyexcel</name>
 

src/main/java/com/alibaba/excel/analysis/v03/XlsSaxAnalyser.java

@@ -70,12 +70,12 @@ import com.alibaba.excel.read.metadata.holder.xls.XlsReadWorkbookHolder;
  * <p>
  * * To turn an excel file into a CSV or similar, then see * the XLS2CSVmra example *
  * </p>
- * * * @see <a href=
+ * * * @see <a href= "http://svn.apache.org/repos/asf/poi/trunk/src/examples/src/org/apache/poi/hssf/eventusermodel/examples/XLS2CSVmra.java">XLS2CSVmra</a>
- * "http://svn.apache.org/repos/asf/poi/trunk/src/examples/src/org/apache/poi/hssf/eventusermodel/examples/XLS2CSVmra.java">XLS2CSVmra</a>
  *
  * @author jipengfei
  */
 public class XlsSaxAnalyser implements HSSFListener, ExcelReadExecutor {
+
     private static final Logger LOGGER = LoggerFactory.getLogger(XlsSaxAnalyser.class);
     private static final short DUMMY_RECORD_SID = -1;
     private XlsReadContext xlsReadContext;
@@ -146,8 +146,8 @@ public class XlsSaxAnalyser implements HSSFListener, ExcelReadExecutor {
         if (handler == null) {
             return;
         }
-        boolean ignoreRecord = (handler instanceof IgnorableXlsRecordHandler)
+        boolean ignoreRecord =
-            && xlsReadContext.xlsReadSheetHolder() != null && xlsReadContext.xlsReadWorkbookHolder().getIgnoreRecord();
+            (handler instanceof IgnorableXlsRecordHandler) && xlsReadContext.xlsReadWorkbookHolder().getIgnoreRecord();
         if (ignoreRecord) {
             // No need to read the current sheet
             return;

src/test/java/com/alibaba/easyexcel/test/core/skip/SkipData.java

@@ -0,0 +1,15 @@
+package com.alibaba.easyexcel.test.core.skip;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+import lombok.Data;
+
+/**
+ * @author Jiaju Zhuang
+ */
+@Data
+public class SkipData {
+
+    @ExcelProperty("姓名")
+    private String name;
+}

src/test/java/com/alibaba/easyexcel/test/core/skip/SkipDataTest.java

@@ -0,0 +1,86 @@
+package com.alibaba.easyexcel.test.core.skip;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runners.MethodSorters;
+
+import com.alibaba.easyexcel.test.core.simple.SimpleData;
+import com.alibaba.easyexcel.test.core.simple.SimpleDataListener;
+import com.alibaba.easyexcel.test.core.simple.SimpleDataSheetNameListener;
+import com.alibaba.easyexcel.test.util.TestFileUtil;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelReader;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.event.SyncReadListener;
+import com.alibaba.excel.read.metadata.ReadSheet;
+import com.alibaba.excel.write.metadata.WriteSheet;
+
+/**
+ * @author Jiaju Zhuang
+ */
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class SkipDataTest {
+
+    private static File file07;
+    private static File file03;
+
+    @BeforeClass
+    public static void init() {
+        file07 = TestFileUtil.createNewFile("skip.xlsx");
+        file03 = TestFileUtil.createNewFile("skip.xls");
+    }
+
+    @Test
+    public void t01ReadAndWrite07() {
+        readAndWrite(file07);
+    }
+
+    @Test
+    public void t02ReadAndWrite03() {
+        readAndWrite(file03);
+    }
+
+    private void readAndWrite(File file) {
+        ExcelWriter excelWriter = EasyExcel.write(file, SimpleData.class).build();
+        WriteSheet writeSheet0 = EasyExcel.writerSheet(0, "第一个").build();
+        WriteSheet writeSheet1 = EasyExcel.writerSheet(1, "第二个").build();
+        WriteSheet writeSheet2 = EasyExcel.writerSheet(2, "第三个").build();
+        WriteSheet writeSheet3 = EasyExcel.writerSheet(3, "第四个").build();
+        excelWriter.write(data("name1"), writeSheet0);
+        excelWriter.write(data("name2"), writeSheet1);
+        excelWriter.write(data("name3"), writeSheet2);
+        excelWriter.write(data("name4"), writeSheet3);
+        excelWriter.finish();
+
+        List<SkipData> list = EasyExcel.read(file, SkipData.class, null).sheet("第二个").doReadSync();
+        Assert.assertEquals(1, list.size());
+        Assert.assertEquals("name2", list.get(0).getName());
+
+        SyncReadListener syncReadListener = new SyncReadListener();
+        ExcelReader excelReader = EasyExcel.read(file, SkipData.class, null).registerReadListener(syncReadListener)
+            .build();
+        ReadSheet readSheet1 = EasyExcel.readSheet("第二个").build();
+        ReadSheet readSheet3 = EasyExcel.readSheet("第四个").build();
+        excelReader.read(readSheet1, readSheet3);
+        List<Object> syncList = syncReadListener.getList();
+        Assert.assertEquals(2, syncList.size());
+        Assert.assertEquals("name2", ((SkipData) syncList.get(0)).getName());
+        Assert.assertEquals("name4", ((SkipData) syncList.get(1)).getName());
+        excelReader.finish();
+    }
+
+
+    private List<SkipData> data(String name) {
+        List<SkipData> list = new ArrayList<SkipData>();
+        SkipData data = new SkipData();
+        data.setName(name);
+        list.add(data);
+        return list;
+    }
+}

update.md

@@ -1,3 +1,6 @@
+# 2.2.6
+* 修改跳着读取03版本空指针bug
+
 # 2.2.5
 * `ExcelProperty`新增`order` 用于排序
 *  修复导出指定`index`会导致空行的bug