Merge pull request #253 from ozlerhakan/3.1.9

dump version 3.1.9

Author: ozlerhakan

README.adoc

@@ -2,8 +2,8 @@
 :toclevels: 2
 
 = Poiji
-:version: v3.1.8
-:branch: 3.1.8
+:version: v3.1.9
+:branch: 3.1.9
 
 image:https://github.com/ozlerhakan/poiji/actions/workflows/maven.yml/badge.svg["Build Status"] image:https://app.codacy.com/project/badge/Grade/64f7e2cb9e604807b62334a4cfc3952d["Codacy code quality",link="https://www.codacy.com/gh/ozlerhakan/poiji/dashboard?utm_source=github.com&utm_medium=referral&utm_content=ozlerhakan/poiji&utm_campaign=Badge_Grade"]
 image:https://codecov.io/gh/ozlerhakan/poiji/branch/{branch}/graph/badge.svg?token=MN6V6xOWBq["Codecov",link="https://codecov.io/gh/ozlerhakan/poiji"] image:https://img.shields.io/badge/apache.poi-5.2.1-brightgreen.svg[] image:https://app.fossa.com/api/projects/git%2Bgithub.com%2Fozlerhakan%2Fpoiji.svg?type=shield["FOSSA Status",link="https://app.fossa.com/projects/git%2Bgithub.com%2Fozlerhakan%2Fpoiji?ref=badge_shield"]
@@ -25,15 +25,15 @@ In your Maven/Gradle project, first add the corresponding dependency:
 <dependency>
   <groupId>com.github.ozlerhakan</groupId>
   <artifactId>poiji</artifactId>
-  <version>3.1.8</version>
+  <version>3.1.9</version>
 </dependency>
 ----
 
 .gradle
 [source,groovy]
 ----
 dependencies {
-    compile 'com.github.ozlerhakan:poiji:3.1.8'
+    compile 'com.github.ozlerhakan:poiji:3.1.9'
 }
 ----
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.github.ozlerhakan</groupId>
     <artifactId>poiji</artifactId>
-    <version>3.1.8</version>
+    <version>3.1.9</version>
     <packaging>jar</packaging>
 
     <name>poiji</name>

src/main/java/com/poiji/bind/mapping/PoijiHandler.java

@@ -199,6 +199,10 @@ public void endRow(int rowNum) {
 
     @Override
     public void cell(String cellReference, String formattedValue, XSSFComment comment) {
+        if (cellReference == null) {
+            // TODO hidden log required; a cell reference could return null
+            return;
+        }
         final CellAddress cellAddress = new CellAddress(cellReference);
         int row = cellAddress.getRow();
         int headerStart = options.getHeaderStart();

src/main/java/com/poiji/bind/mapping/XSSFSheetXMLPoijiHandler.java

@@ -52,13 +52,13 @@ public void startElement(String uri, String localName, String qName, Attributes
                         !"e".equals(cellType) &&
                         !"inlineStr".equals(cellType) &&
                         !"s".equals(cellType) &&
-                        !"str".equals(cellType)) {
-                    if (cellStyleStr != null) {
-                        int styleIndex = Integer.parseInt(cellStyleStr);
+                        !"str".equals(cellType) &&
+                        cellStyleStr != null) {
+                    int styleIndex = Integer.parseInt(cellStyleStr);
 
-                        if (poijiOptions.isDisableXLSXNumberCellFormat()) {
-                            attributes2.removeAttribute(styleIndex);
-                        }
+                    if (poijiOptions.isDisableXLSXNumberCellFormat() &&
+                            attributes2.getLength() > styleIndex) {
+                        attributes2.removeAttribute(styleIndex);
                     }
                 }
             }

src/test/java/com/poiji/deserialize/NullReferenceTest.java

@@ -0,0 +1,29 @@
+package com.poiji.deserialize;
+
+import com.poiji.bind.Poiji;
+import com.poiji.deserialize.model.AutoImport;
+import com.poiji.option.PoijiOptions;
+import org.junit.Test;
+
+import java.io.File;
+import java.util.List;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+public class NullReferenceTest {
+
+    @Test
+    public void shouldReturnEmptyWhenCellReferenceNull() {
+        PoijiOptions options = PoijiOptions.PoijiOptionsBuilder.settings().disableXLSXNumberCellFormat().build();
+
+        List<AutoImport> result = Poiji.fromExcel(new File("src/test/resources/autos2.xlsx"), AutoImport.class, options);
+
+        assertNotNull(result);
+        assertThat(result.size(), is(20));
+        assertNull(result.get(0).getPmercado());
+
+    }
+}

src/test/java/com/poiji/deserialize/model/AutoImport.java

@@ -0,0 +1,13 @@
+package com.poiji.deserialize.model;
+
+import com.poiji.annotation.ExcelCell;
+
+public class AutoImport {
+
+    @ExcelCell(7)
+    private Double pmercado;
+
+    public Double getPmercado() {
+        return pmercado;
+    }
+}