Merge 673974b into 12283d9

ozlerhakan · Feb 8, 2020 · c28073c · c28073c
2 parents 12283d9 + 673974b
commit c28073c
Show file tree

Hide file tree

Showing 27 changed files with 1,153 additions and 58 deletions.
diff --git a/pom.xml b/pom.xml
@@ -70,6 +70,12 @@
             <version>4.12</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.10</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <distributionManagement>

diff --git a/src/main/java/com/poiji/annotation/ExcelCellName.java b/src/main/java/com/poiji/annotation/ExcelCellName.java
@@ -14,10 +14,31 @@
 @Documented
 public @interface ExcelCellName {
 
+    int ABSENT_ORDER = -1;
+
     /**
      * Specifies the column name where the corresponding value is mapped from the excel data
      *
      * @return column name
      */
     String value();
+
+    /**
+     * Specifies the column order in saved file
+     *
+     * @return column order
+     */
+    int order() default ABSENT_ORDER;
+
+    /**
+     * Delimeter for column multiname.
+     * <p>
+     * Example: @ExcelCellName(value = "id,identifier", delimerer = ",")
+     * reading: column with name 'id' will be mapped into field, or if no column 'id',
+     * then column 'identifier' will be mapped into field.
+     * writing: field will be saved into column 'id'
+     *
+     * @return delimeter for column multiname.
+     */
+    String delimeter() default "";
 }
diff --git a/src/main/java/com/poiji/bind/Poiji.java b/src/main/java/com/poiji/bind/Poiji.java
@@ -7,8 +7,8 @@
 import com.poiji.exception.PoijiException;
 import com.poiji.option.PoijiOptions;
 import com.poiji.option.PoijiOptions.PoijiOptionsBuilder;
+import com.poiji.save.FileSaverFactory;
 import com.poiji.util.Files;
-
 import java.io.File;
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -207,17 +207,25 @@ public static synchronized <T> List<T> fromExcel(final InputStream inputStream,
      * language access control and the underlying field is either inaccessible or final.
      * @see Poiji#fromExcel(File, Class)
      */
-    public static synchronized <T> void fromExcel(final InputStream inputStream,
-                                                  final PoijiExcelType excelType,
-                                                  final Class<T> type,
-                                                  final PoijiOptions options,
-                                                  final Consumer<? super T> consumer) {
+    public static synchronized <T> void fromExcel(final InputStream inputStream, final PoijiExcelType excelType,
+        final Class<T> type, final PoijiOptions options, final Consumer<? super T> consumer
+    ) {
         Objects.requireNonNull(excelType);
 
         final Unmarshaller unmarshaller = deserializer(inputStream, excelType, options);
         unmarshaller.unmarshal(type, consumer);
     }
 
+    public static <T> void toExcel(final File file, final Class<T> clazz, final List<T> data) {
+        toExcel(file, clazz, data, PoijiOptionsBuilder.settings().build());
+    }
+
+    public static <T> void toExcel(
+        final File file, final Class<T> clazz, final List<T> data, final PoijiOptions options
+    ) {
+        new FileSaverFactory<>(clazz, options).toFile(file).save(data);
+    }
+
     private static Unmarshaller deserializer(final File file, final PoijiOptions options) {
         final PoijiFile<?> poijiFile = new PoijiFile<>(file);
 

diff --git a/src/main/java/com/poiji/bind/mapping/HSSFUnmarshaller.java b/src/main/java/com/poiji/bind/mapping/HSSFUnmarshaller.java
@@ -10,13 +10,6 @@
 import com.poiji.exception.IllegalCastException;
 import com.poiji.option.PoijiOptions;
 import com.poiji.util.ReflectUtil;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.DataFormatter;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -28,6 +21,12 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellType;
+import org.apache.poi.ss.usermodel.DataFormatter;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
 
 import static java.lang.String.valueOf;
 
@@ -196,15 +195,29 @@ private Integer getFieldColumn(final Field field) {
         } else {
             ExcelCellName excelCellName = field.getAnnotation(ExcelCellName.class);
             if (excelCellName != null) {
-                final String titleName = options.getCaseInsensitive()
-                    ? excelCellName.value().toLowerCase()
-                    : excelCellName.value();
-                column = columnIndexPerTitle.get(titleName);
+                column = getFieldColumnFromExcelCellName(excelCellName);
             }
         }
         return column;
     }
 
+    private Integer getFieldColumnFromExcelCellName(final ExcelCellName excelCellName) {
+        final String titleName = options.getCaseInsensitive()
+            ? excelCellName.value().toLowerCase()
+            : excelCellName.value();
+        if (excelCellName.delimeter().isEmpty()) {
+            return columnIndexPerTitle.get(titleName);
+        } else {
+            final String[] possibleTitles = titleName.split(excelCellName.delimeter());
+            for (final String possibleTitle : possibleTitles) {
+                if (columnIndexPerTitle.containsKey(possibleTitle)) {
+                    return columnIndexPerTitle.get(possibleTitle);
+                }
+            }
+        }
+        return null;
+    }
+
     private <T> void constructTypeValue(Row currentRow, T instance, Field field, int column) {
         Cell cell = currentRow.getCell(column);
 

diff --git a/src/main/java/com/poiji/bind/mapping/PoijiHandler.java b/src/main/java/com/poiji/bind/mapping/PoijiHandler.java
@@ -9,15 +9,14 @@
 import com.poiji.exception.IllegalCastException;
 import com.poiji.option.PoijiOptions;
 import com.poiji.util.ReflectUtil;
-import org.apache.poi.ss.util.CellAddress;
-import org.apache.poi.xssf.eventusermodel.XSSFSheetXMLHandler.SheetContentsHandler;
-import org.apache.poi.xssf.usermodel.XSSFComment;
-
 import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Consumer;
 import java.util.stream.Stream;
+import org.apache.poi.ss.util.CellAddress;
+import org.apache.poi.xssf.eventusermodel.XSSFSheetXMLHandler.SheetContentsHandler;
+import org.apache.poi.xssf.usermodel.XSSFComment;
 
 import static java.lang.String.valueOf;
 
@@ -169,14 +168,10 @@ private boolean setValue(Field field, int column, String content, Object ins) {
         } else {
             ExcelCellName excelCellName = field.getAnnotation(ExcelCellName.class);
             if (excelCellName != null) {
-                Class<?> fieldType = field.getType();
-                final String titleName = options.getCaseInsensitive()
-                    ? excelCellName.value().toLowerCase()
-                    : excelCellName.value();
-                final Integer titleColumn = columnIndexPerTitle.get(titleName);
+                final Integer titleColumn = getFieldColumnFromExcelCellName(excelCellName);
                 //Fix both columns mapped to name passing this condition below
-                if (titleColumn != null && titleColumn == column) {
-                    Object o = casting.castValue(fieldType, content, options);
+                if (titleColumn != null && titleColumn.equals(column)) {
+                    Object o = casting.castValue(field.getType(), content, options);
                     setFieldData(field, o, ins);
                     return true;
                 }
@@ -185,6 +180,23 @@ private boolean setValue(Field field, int column, String content, Object ins) {
         return false;
     }
 
+    private Integer getFieldColumnFromExcelCellName(final ExcelCellName excelCellName) {
+        final String titleName = options.getCaseInsensitive()
+            ? excelCellName.value().toLowerCase()
+            : excelCellName.value();
+        if (excelCellName.delimeter().isEmpty()) {
+            return columnIndexPerTitle.get(titleName);
+        } else {
+            final String[] possibleTitles = titleName.split(excelCellName.delimeter());
+            for (final String possibleTitle : possibleTitles) {
+                if (columnIndexPerTitle.containsKey(possibleTitle)) {
+                    return columnIndexPerTitle.get(possibleTitle);
+                }
+            }
+        }
+        return null;
+    }
+
     private void setFieldData(Field field, Object o, Object instance) {
         try {
             field.setAccessible(true);

diff --git a/src/main/java/com/poiji/bind/mapping/SheetNameExtractor.java b/src/main/java/com/poiji/bind/mapping/SheetNameExtractor.java
@@ -2,19 +2,19 @@
 
 import com.poiji.annotation.ExcelSheet;
 import com.poiji.option.PoijiOptions;
-
 import java.util.Optional;
 
 /**
  * Utility class to extract the sheet name.
  */
-class SheetNameExtractor {
+public class SheetNameExtractor {
     /**
      * Extracts the sheet name from either the annotated value {@link ExcelSheet} from the model class or from the sheet name set
      * in the Poiji Options. Poiji first looks at {@link ExcelSheet} then {@link PoijiOptions}.
-     * @param type The class instance of the object model.
+     *
+     * @param type    The class instance of the object model.
      * @param options The Poiji options.
-     * @param <T> The type of the object model.
+     * @param <T>     The type of the object model.
      * @return an Optional sheet name
      */
     public static <T> Optional<String> getSheetName(Class<T> type, PoijiOptions options) {

diff --git a/src/main/java/com/poiji/config/DefaultCasting.java b/src/main/java/com/poiji/config/DefaultCasting.java
@@ -1,5 +1,7 @@
 package com.poiji.config;
 
+import com.poiji.option.PoijiOptions;
+import com.poiji.parser.Parsers;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -13,9 +15,6 @@
 import java.util.Date;
 import java.util.List;
 
-import com.poiji.option.PoijiOptions;
-import com.poiji.parser.Parsers;
-
 /**
  * Created by hakan on 22/01/2017.
  */
@@ -222,9 +221,24 @@ public Object castValue(Class<?> fieldType, String rawValue, int row, int col, P
         } else if (fieldType == Float.class) {
             o = floatValue(value, sheetName, row, col, options);
 
-        } else if (fieldType == boolean.class || fieldType == Boolean.class) {
+        } else if (fieldType == boolean.class) {
             o = Boolean.valueOf(value);
 
+        } else if (fieldType == Boolean.class) {
+            o = value.isEmpty() ? options.preferNullOverDefault() ? null : false : Boolean.valueOf(value);
+
+        } else if (fieldType == byte.class) {
+            o = Byte.valueOf(value);
+
+        } else if (fieldType == Byte.class) {
+            o = value.isEmpty() ? options.preferNullOverDefault() ? null : (byte) 0 : Byte.valueOf(value);
+
+        } else if (fieldType == short.class) {
+            o = Short.valueOf(value);
+
+        } else if (fieldType == Short.class) {
+            o = value.isEmpty() ? options.preferNullOverDefault() ? null : (short) 0 : Short.valueOf(value);
+
         } else if (fieldType == Date.class) {
             o = dateValue(value, sheetName, row, col, options);