rearrange code

ozlerhakan · Jan 24, 2017 · 7e08070 · 7e08070
1 parent 35eff54
commit 7e08070
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 30 deletions.
diff --git a/src/main/java/com/poiji/internal/PoiWorkbook.java b/src/main/java/com/poiji/internal/PoiWorkbook.java
@@ -1,6 +1,7 @@
 package com.poiji.internal;
 
 import com.poiji.exception.InvalidExcelFileExtension;
+import com.poiji.exception.PoijiException;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -12,56 +13,58 @@
  */
 public abstract class PoiWorkbook {
 
-    protected final PoijiStream poiParser;
+    private final PoijiStream stream;
 
-    private PoiWorkbook(PoijiStream poiParser) {
-        this.poiParser = poiParser;
+    private PoiWorkbook(PoijiStream stream) {
+        this.stream = stream;
     }
 
     public abstract Workbook workbook();
 
-    static PoiWorkbook workbook(String fileExtension, PoijiStream poiParser) {
+    public static PoiWorkbook workbook(String fileExtension, PoijiStream stream) {
         switch (fileExtension) {
             case ".xls":
-                return new PoiWorkbookHSSH(poiParser);
+                return new PoiWorkbookHSSH(stream);
             case ".xlsx":
-                return new PoiWorkbookXSSH(poiParser);
+                return new PoiWorkbookXSSH(stream);
             default:
                 throw new InvalidExcelFileExtension("Invalid file extension (" + fileExtension + "), excepted .xls or .xlsx");
         }
     }
 
+    protected PoijiStream stream() {
+        return stream;
+    }
+
     private static class PoiWorkbookXSSH extends PoiWorkbook {
 
-        private PoiWorkbookXSSH(PoijiStream poiParser) {
-            super(poiParser);
+        private PoiWorkbookXSSH(PoijiStream stream) {
+            super(stream);
         }
 
         @Override
         public Workbook workbook() {
             try {
-                return new XSSFWorkbook(poiParser.getFis());
+                return new XSSFWorkbook(stream().get());
             } catch (IOException e) {
-                throw new RuntimeException(e);
+                throw new PoijiException("Problem occurred while creating XSSFWorkbook", e);
             }
         }
 
     }
 
     private static class PoiWorkbookHSSH extends PoiWorkbook {
 
-        private PoiWorkbookHSSH(PoijiStream poiParser) {
-            super(poiParser);
+        private PoiWorkbookHSSH(PoijiStream stream) {
+            super(stream);
         }
 
         @Override
         public Workbook workbook() {
             try {
-                return new HSSFWorkbook(poiParser.getFis());
+                return new HSSFWorkbook(stream().get());
             } catch (IOException e) {
-                throw new RuntimeException("Problem occurred while creting ");
-            } catch (NullPointerException e) {
-                throw new RuntimeException("Problem occurred while cre");
+                throw new PoijiException("Problem occurred while creating HSSFWorkbook", e);
             }
         }
 

diff --git a/src/main/java/com/poiji/internal/Poiji.java b/src/main/java/com/poiji/internal/Poiji.java
@@ -2,7 +2,6 @@
 
 import com.poiji.internal.PoijiOptions.PoijiOptionsBuilder;
 import com.poiji.internal.marshaller.Deserializer;
-import com.poiji.internal.marshaller.Unmarshaller;
 import com.poiji.util.Files;
 
 import java.io.File;
@@ -34,7 +33,7 @@ public static <T> List<T> fromExcel(File file, Class<T> clazz, PoijiOptions opti
     private static Deserializer deserializer(File file) throws FileNotFoundException {
         final PoijiStream poiParser = new PoijiStream(fileInputStream(file));
         final PoiWorkbook workbook = PoiWorkbook.workbook(Files.getExtension(file.getName()), poiParser);
-        return Unmarshaller.instance(workbook);
+        return Deserializer.instance(workbook);
     }
 
     private static <T> List<T> deserialize(final Class<T> type, final Deserializer unmarshaller) {

diff --git a/src/main/java/com/poiji/internal/PoijiStream.java b/src/main/java/com/poiji/internal/PoijiStream.java
@@ -7,13 +7,17 @@
  */
 class PoijiStream<T extends InputStream> {
 
-    private final T fis;
+    private final T t;
 
-    PoijiStream(T fis) {
-        this.fis = fis;
+    PoijiStream(T t) {
+        this.t = t;
     }
 
-    T getFis() {
-        return fis;
+    /**
+     * the T derived from {@link InputStream}
+     * @return T
+     */
+    public T get() {
+        return t;
     }
 }
diff --git a/src/main/java/com/poiji/internal/marshaller/Deserializer.java b/src/main/java/com/poiji/internal/marshaller/Deserializer.java
@@ -1,5 +1,6 @@
 package com.poiji.internal.marshaller;
 
+import com.poiji.internal.PoiWorkbook;
 import com.poiji.internal.PoijiOptions;
 
 import java.util.List;
@@ -10,4 +11,8 @@
 public interface Deserializer {
 
     <T> List<T> deserialize(Class<T> type, PoijiOptions options);
+
+    static Deserializer instance(PoiWorkbook workbook) {
+        return new Unmarshaller(workbook);
+    }
 }
diff --git a/src/main/java/com/poiji/internal/marshaller/Unmarshaller.java b/src/main/java/com/poiji/internal/marshaller/Unmarshaller.java
@@ -27,7 +27,7 @@ public final class Unmarshaller implements Deserializer {
     private final PoiWorkbook poiWorkbook;
     private final DataFormatter df = new DataFormatter();
 
-    private Unmarshaller(final PoiWorkbook poiWorkbook) {
+    Unmarshaller(final PoiWorkbook poiWorkbook) {
         this.poiWorkbook = poiWorkbook;
     }
 
@@ -138,8 +138,4 @@ private Object castValue(Class<?> fieldType, String value) {
     private boolean skip(final Row currentRow, int skip) {
         return currentRow.getRowNum() + 1 <= skip;
     }
-
-    public static Deserializer instance(PoiWorkbook workbook) {
-        return new Unmarshaller(workbook);
-    }
 }
diff --git a/src/test/java/com/poiji/deserialize/DerializersEmptyCellTest.java b/src/test/java/com/poiji/deserialize/DerializersEmptyCellTest.java
@@ -13,7 +13,7 @@
 import java.util.Arrays;
 import java.util.List;
 
-import static com.poiji.internal.PoijiOptions.*;
+import static com.poiji.internal.PoijiOptions.PoijiOptionsBuilder;
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;

diff --git a/src/test/java/com/poiji/deserialize/InheritanceTest.java b/src/test/java/com/poiji/deserialize/InheritanceTest.java
@@ -1,7 +1,6 @@
 package com.poiji.deserialize;
 
 import com.poiji.deserialize.model.Car;
-import com.poiji.deserialize.model.Employee;
 import com.poiji.deserialize.model.Vehicle;
 import com.poiji.internal.Poiji;
 import org.junit.Test;