refactoring source code + implement importer

phamvanlinh20111993 · Sep 17, 2023 · 96108bd · 96108bd
1 parent 98dc702
commit 96108bd
Show file tree

Hide file tree

Showing 34 changed files with 392 additions and 346 deletions.
diff --git a/src/excel/exporter/config/CellBorder.java → src/excel/exporter/datainfo/CellBorder.java b/src/excel/exporter/config/CellBorder.java → src/excel/exporter/datainfo/CellBorder.java
@@ -1,4 +1,4 @@
-package excel.exporter.config;
+package excel.exporter.datainfo;
 
 import org.apache.poi.ss.usermodel.BorderStyle;
 

diff --git a/src/excel/exporter/config/CellInfo.java → src/excel/exporter/datainfo/CellInfo.java b/src/excel/exporter/config/CellInfo.java → src/excel/exporter/datainfo/CellInfo.java
@@ -1,4 +1,4 @@
-package excel.exporter.config;
+package excel.exporter.datainfo;
 
 import java.awt.Color;
 

diff --git a/...excel/exporter/config/CellMoreConfig.java → ...cel/exporter/datainfo/CellMoreConfig.java b/...excel/exporter/config/CellMoreConfig.java → ...cel/exporter/datainfo/CellMoreConfig.java
@@ -1,4 +1,4 @@
-package excel.exporter.config;
+package excel.exporter.datainfo;
 
 // TODO implement in the future
 public class CellMoreConfig {

diff --git a/src/excel/exporter/config/ColumnInfo.java → src/excel/exporter/datainfo/ColumnInfo.java b/src/excel/exporter/config/ColumnInfo.java → src/excel/exporter/datainfo/ColumnInfo.java
@@ -1,4 +1,4 @@
-package excel.exporter.config;
+package excel.exporter.datainfo;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 

diff --git a/src/excel/exporter/config/FontInfo.java → src/excel/exporter/datainfo/FontInfo.java b/src/excel/exporter/config/FontInfo.java → src/excel/exporter/datainfo/FontInfo.java
@@ -1,4 +1,4 @@
-package excel.exporter.config;
+package excel.exporter.datainfo;
 
 import java.awt.Color;
 

diff --git a/src/excel/exporter/config/HeaderInfo.java → src/excel/exporter/datainfo/HeaderInfo.java b/src/excel/exporter/config/HeaderInfo.java → src/excel/exporter/datainfo/HeaderInfo.java
@@ -1,4 +1,4 @@
-package excel.exporter.config;
+package excel.exporter.datainfo;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 

diff --git a/src/excel/exporter/config/HeaderName.java → src/excel/exporter/datainfo/HeaderName.java b/src/excel/exporter/config/HeaderName.java → src/excel/exporter/datainfo/HeaderName.java
@@ -1,4 +1,4 @@
-package excel.exporter.config;
+package excel.exporter.datainfo;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 

diff --git a/src/excel/exporter/config/RowInfo.java → src/excel/exporter/datainfo/RowInfo.java b/src/excel/exporter/config/RowInfo.java → src/excel/exporter/datainfo/RowInfo.java
@@ -1,4 +1,4 @@
-package excel.exporter.config;
+package excel.exporter.datainfo;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 

diff --git a/src/excel/exporter/config/SheetInfo.java → src/excel/exporter/datainfo/SheetInfo.java b/src/excel/exporter/config/SheetInfo.java → src/excel/exporter/datainfo/SheetInfo.java
@@ -1,4 +1,4 @@
-package excel.exporter.config;
+package excel.exporter.datainfo;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 

diff --git a/...cel/exporter/config/SheetInfoSetting.java → ...l/exporter/datainfo/SheetInfoSetting.java b/...cel/exporter/config/SheetInfoSetting.java → ...l/exporter/datainfo/SheetInfoSetting.java
@@ -1,4 +1,4 @@
-package excel.exporter.config;
+package excel.exporter.datainfo;
 
 import java.util.List;
 

diff --git a/src/excel/exporter/handle/AbstractTableExcelExporter.java b/src/excel/exporter/handle/AbstractTableExcelExporter.java
@@ -24,12 +24,12 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import excel.exporter.config.CellBorder;
-import excel.exporter.config.CellInfo;
-import excel.exporter.config.ColumnInfo;
-import excel.exporter.config.HeaderInfo;
-import excel.exporter.config.SheetInfo;
-import excel.exporter.config.SheetInfoSetting;
+import excel.exporter.datainfo.CellBorder;
+import excel.exporter.datainfo.CellInfo;
+import excel.exporter.datainfo.ColumnInfo;
+import excel.exporter.datainfo.HeaderInfo;
+import excel.exporter.datainfo.SheetInfo;
+import excel.exporter.datainfo.SheetInfoSetting;
 import excel.exporter.enums.ExcelType;
 import excel.exporter.enums.HeaderNameFormatType;
 import utils.ObjectUtils;

diff --git a/src/excel/exporter/handle/SimpleMultiSheetTableExcelExporter.java b/src/excel/exporter/handle/SimpleMultiSheetTableExcelExporter.java
@@ -11,7 +11,7 @@
 import org.apache.poi.ss.usermodel.IndexedColors;
 import org.apache.poi.ss.usermodel.VerticalAlignment;
 
-import excel.exporter.config.SheetInfoSetting;
+import excel.exporter.datainfo.SheetInfoSetting;
 import excel.exporter.enums.ExcelType;
 
 public class SimpleMultiSheetTableExcelExporter extends AbstractTableExcelExporter {

diff --git a/src/excel/exporter/handle/SimpleSingleSheetTableExcelExporter.java b/src/excel/exporter/handle/SimpleSingleSheetTableExcelExporter.java
@@ -17,7 +17,7 @@
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.VerticalAlignment;
 
-import excel.exporter.config.SheetInfoSetting;
+import excel.exporter.datainfo.SheetInfoSetting;
 import excel.exporter.enums.ExcelType;
 
 public class SimpleSingleSheetTableExcelExporter<T extends Object> extends AbstractTableExcelExporter {

diff --git a/src/excel/exporter/handle/TableExcelExporter.java b/src/excel/exporter/handle/TableExcelExporter.java
@@ -20,13 +20,13 @@
 import excel.exporter.annotation.HeaderSetting;
 import excel.exporter.annotation.RowSetting;
 import excel.exporter.annotation.SheetSetting;
-import excel.exporter.config.CellInfo;
-import excel.exporter.config.ColumnInfo;
-import excel.exporter.config.FontInfo;
-import excel.exporter.config.HeaderInfo;
-import excel.exporter.config.RowInfo;
-import excel.exporter.config.SheetInfo;
-import excel.exporter.config.SheetInfoSetting;
+import excel.exporter.datainfo.CellInfo;
+import excel.exporter.datainfo.ColumnInfo;
+import excel.exporter.datainfo.FontInfo;
+import excel.exporter.datainfo.HeaderInfo;
+import excel.exporter.datainfo.RowInfo;
+import excel.exporter.datainfo.SheetInfo;
+import excel.exporter.datainfo.SheetInfoSetting;
 import utils.Constants;
 import utils.ObjectUtils;
 
@@ -175,7 +175,7 @@ default SheetInfoSetting toSheetInfo(Object obj) {
 			if (headerInfos.get(index).getName() == null
 					|| StringUtils.isAllEmpty(headerInfos.get(index).getName().getValue())) {
 				HeaderInfo headerInfo = headerInfos.get(index);
-				excel.exporter.config.HeaderName headerName = new excel.exporter.config.HeaderName();
+				excel.exporter.datainfo.HeaderName headerName = new excel.exporter.datainfo.HeaderName();
 				if (field.isAnnotationPresent(HeaderName.class)) {
 					headerName = toHeaderName(field.getAnnotation(HeaderName.class));
 					// we don't have any setting, auto get header name is the class property
@@ -221,9 +221,9 @@ default HeaderInfo toHeaderInfo(HeaderSetting headerSetting) {
 	 * @param headerName
 	 * @return
 	 */
-	default excel.exporter.config.HeaderName toHeaderName(HeaderName headerName) {
-		excel.exporter.config.HeaderName headerNameSetting = (excel.exporter.config.HeaderName) convertAnnotationToConcreteObject(
-				new excel.exporter.config.HeaderName(), headerName);
+	default excel.exporter.datainfo.HeaderName toHeaderName(HeaderName headerName) {
+		excel.exporter.datainfo.HeaderName headerNameSetting = (excel.exporter.datainfo.HeaderName) convertAnnotationToConcreteObject(
+				new excel.exporter.datainfo.HeaderName(), headerName);
 		return headerNameSetting;
 	}
 

diff --git a/src/excel/exporter/main/Example1.java b/src/excel/exporter/main/Example1.java
@@ -1,6 +1,6 @@
 package excel.exporter.main;
 
-import excel.exporter.config.FontInfo;
+import excel.exporter.datainfo.FontInfo;
 import lombok.Data;
 
 @Data

diff --git a/src/excel/exporter/main/Main1.java b/src/excel/exporter/main/Main1.java
@@ -6,7 +6,7 @@
 import java.lang.reflect.Method;
 import java.util.Optional;
 
-import excel.exporter.config.CellInfo;
+import excel.exporter.datainfo.CellInfo;
 import utils.Constants;
 import utils.ObjectUtils;
 

diff --git a/src/excel/importer/SimpleTableExcelImporter.java b/src/excel/importer/SimpleTableExcelImporter.java
diff --git a/src/excel/importer/TableExcelImporter.java b/src/excel/importer/TableExcelImporter.java
diff --git a/...el/importer/annotation/MappingHeader.java → ...cel/importer/annotation/MappingField.java b/...el/importer/annotation/MappingHeader.java → ...cel/importer/annotation/MappingField.java
@@ -9,7 +9,7 @@
 
 @Retention(value = RetentionPolicy.RUNTIME)
 @Target(value = { ElementType.FIELD })
-public @interface MappingHeader {
+public @interface MappingField {
 
 	String value() default "";