update the xls steps

ozlerhakan · Nov 6, 2017 · 3278f66 · 3278f66
1 parent 8055200
commit 3278f66
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/src/main/java/com/poiji/bind/mapping/HSSFUnmarshaller.java b/src/main/java/com/poiji/bind/mapping/HSSFUnmarshaller.java
@@ -14,6 +14,7 @@
 import org.apache.poi.ss.usermodel.Workbook;
 
 import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -61,8 +62,8 @@ public <T> List<T> unmarshal(Class<T> type) {
     private <T> T deserialize0(Row currentRow, Class<T> type) {
         T instance;
         try {
-            instance = type.newInstance();
-        } catch (IllegalAccessException | InstantiationException e) {
+            instance = type.getDeclaredConstructor().newInstance();
+        } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException | InstantiationException e) {
             throw new PoijiInstantiationException("Cannot create a new instance of " + type.getName());
         }
 
@@ -76,18 +77,16 @@ private <T> T tailSetFieldValue(Row currentRow, Class<? super T> type, T instanc
             if (index != null) {
                 Class<?> fieldType = field.getType();
                 Cell cell = currentRow.getCell(index.value());
-                Object o;
-
-                if (!field.isAccessible())
-                    field.setAccessible(true);
 
+                Object o;
                 if (cell != null) {
                     String value = dataFormatter.formatCellValue(cell);
                     o = Casting.castValue(fieldType, value, options);
                 } else {
                     o = Casting.castValue(fieldType, "", options);
                 }
                 try {
+                    field.setAccessible(true);
                     field.set(instance, o);
                 } catch (IllegalAccessException e) {
                     throw new IllegalCastException("Unexpected cast type {" + o + "} of field" + field.getName());

diff --git a/src/main/java/com/poiji/bind/mapping/PoijiHandler.java b/src/main/java/com/poiji/bind/mapping/PoijiHandler.java
@@ -65,12 +65,10 @@ private void setValue(String content, Class<? super T> type, int column) {
                 Class<?> fieldType = field.getType();
 
                 if (column == index.value()) {
-
-                        field.setAccessible(true);
-
                     Object o = Casting.castValue(fieldType, content, options);
 
                     try {
+                        field.setAccessible(true);
                         field.set(instance, o);
                     } catch (IllegalAccessException e) {
                         throw new IllegalCastException("Unexpected cast type {" + o + "} of field" + field.getName());