Skip to content

Commit b7ddb35

Browse files
alaahongalaahong
authored
refactor: update package structure to align with Apache naming and remove useless support module (#607)
* refactor: update package structure to align with Apache naming conventions * refactor: reorganize imports and remove unused module from pom.xml * refactor: update package references to align with Apache naming conventions * refactor: update import BeanMap statements to use new package structure under cn.idev * refactor: update package structure to remove redundant 'excel' prefix in package names * chore: update fastexcel-support dependency version to 1.3.0
1 parent dc86d65 commit b7ddb35

File tree

581 files changed

+2669
-2670
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

581 files changed

+2669
-2670
lines changed

‎.github/workflows/fuzz-tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
run: |
5050
mkdir -p "${{ runner.temp }}/jazzer-artifacts/"
5151
# Execute only tests under fuzz package and force tests not to be skipped
52-
mvn -B -pl fastexcel -am -D"maven.test.skip=false" -DtrimStackTrace=false -D"test=cn.idev.excel.fuzz.*Test" test
52+
mvn -B -pl fastexcel -am -D"maven.test.skip=false" -DtrimStackTrace=false -D"test=org.apache.fesod.excel.fuzz.*Test" test
5353
5454
- name: Upload Jazzer artifacts (crashes, repros)
5555
if: always()

fastexcel-examples/src/test/java/cn/idev/excel/demo/fill/FillData.java renamed to fastexcel-examples/src/test/java/org/apache/fesod/excel/demo/fill/FillData.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package cn.idev.excel.demo.fill;
20+
package org.apache.fesod.excel.demo.fill;
2121

2222
import java.util.Date;
2323
import lombok.EqualsAndHashCode;

fastexcel-examples/src/test/java/cn/idev/excel/demo/fill/FillTest.java renamed to fastexcel-examples/src/test/java/org/apache/fesod/excel/demo/fill/FillTest.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,24 @@
1717
* under the License.
1818
*/
1919

20-
package cn.idev.excel.demo.fill;
20+
package org.apache.fesod.excel.demo.fill;
2121

22-
import cn.idev.excel.ExcelWriter;
23-
import cn.idev.excel.FastExcel;
24-
import cn.idev.excel.enums.WriteDirectionEnum;
25-
import cn.idev.excel.util.ListUtils;
26-
import cn.idev.excel.util.MapUtils;
27-
import cn.idev.excel.util.TestFileUtil;
28-
import cn.idev.excel.write.handler.SheetWriteHandler;
29-
import cn.idev.excel.write.handler.context.SheetWriteHandlerContext;
30-
import cn.idev.excel.write.metadata.WriteSheet;
31-
import cn.idev.excel.write.metadata.fill.FillConfig;
32-
import cn.idev.excel.write.metadata.fill.FillWrapper;
3322
import java.io.File;
3423
import java.util.Date;
3524
import java.util.HashMap;
3625
import java.util.List;
3726
import java.util.Map;
27+
import org.apache.fesod.excel.ExcelWriter;
28+
import org.apache.fesod.excel.FastExcel;
29+
import org.apache.fesod.excel.enums.WriteDirectionEnum;
30+
import org.apache.fesod.excel.util.ListUtils;
31+
import org.apache.fesod.excel.util.MapUtils;
32+
import org.apache.fesod.excel.util.TestFileUtil;
33+
import org.apache.fesod.excel.write.handler.SheetWriteHandler;
34+
import org.apache.fesod.excel.write.handler.context.SheetWriteHandlerContext;
35+
import org.apache.fesod.excel.write.metadata.WriteSheet;
36+
import org.apache.fesod.excel.write.metadata.fill.FillConfig;
37+
import org.apache.fesod.excel.write.metadata.fill.FillWrapper;
3838
import org.apache.poi.ss.usermodel.Sheet;
3939
import org.apache.poi.ss.util.CellRangeAddress;
4040
import org.junit.jupiter.api.Test;

fastexcel-examples/src/test/java/cn/idev/excel/demo/rare/WriteTest.java renamed to fastexcel-examples/src/test/java/org/apache/fesod/excel/demo/rare/WriteTest.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,23 @@
1717
* under the License.
1818
*/
1919

20-
package cn.idev.excel.demo.rare;
20+
package org.apache.fesod.excel.demo.rare;
2121

22-
import cn.idev.excel.ExcelWriter;
23-
import cn.idev.excel.FastExcel;
24-
import cn.idev.excel.demo.read.DemoData;
25-
import cn.idev.excel.util.FileUtils;
26-
import cn.idev.excel.util.ListUtils;
27-
import cn.idev.excel.util.TestFileUtil;
28-
import cn.idev.excel.write.handler.RowWriteHandler;
29-
import cn.idev.excel.write.handler.WorkbookWriteHandler;
30-
import cn.idev.excel.write.handler.context.RowWriteHandlerContext;
31-
import cn.idev.excel.write.handler.context.WorkbookWriteHandlerContext;
32-
import cn.idev.excel.write.metadata.WriteSheet;
3322
import java.io.File;
3423
import java.util.Date;
3524
import java.util.List;
3625
import lombok.extern.slf4j.Slf4j;
26+
import org.apache.fesod.excel.ExcelWriter;
27+
import org.apache.fesod.excel.FastExcel;
28+
import org.apache.fesod.excel.demo.read.DemoData;
29+
import org.apache.fesod.excel.util.FileUtils;
30+
import org.apache.fesod.excel.util.ListUtils;
31+
import org.apache.fesod.excel.util.TestFileUtil;
32+
import org.apache.fesod.excel.write.handler.RowWriteHandler;
33+
import org.apache.fesod.excel.write.handler.WorkbookWriteHandler;
34+
import org.apache.fesod.excel.write.handler.context.RowWriteHandlerContext;
35+
import org.apache.fesod.excel.write.handler.context.WorkbookWriteHandlerContext;
36+
import org.apache.fesod.excel.write.metadata.WriteSheet;
3737
import org.apache.poi.ss.usermodel.Cell;
3838
import org.apache.poi.ss.usermodel.Row;
3939
import org.apache.poi.ss.usermodel.Sheet;

fastexcel-examples/src/test/java/cn/idev/excel/demo/read/CellDataDemoHeadDataListener.java renamed to fastexcel-examples/src/test/java/org/apache/fesod/excel/demo/read/CellDataDemoHeadDataListener.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
* under the License.
1818
*/
1919

20-
package cn.idev.excel.demo.read;
20+
package org.apache.fesod.excel.demo.read;
2121

22-
import cn.idev.excel.context.AnalysisContext;
23-
import cn.idev.excel.read.listener.ReadListener;
24-
import cn.idev.excel.util.ListUtils;
2522
import com.alibaba.fastjson2.JSON;
2623
import java.util.List;
2724
import lombok.extern.slf4j.Slf4j;
25+
import org.apache.fesod.excel.context.AnalysisContext;
26+
import org.apache.fesod.excel.read.listener.ReadListener;
27+
import org.apache.fesod.excel.util.ListUtils;
2828

2929
/**
3030
* Read header

fastexcel-examples/src/test/java/cn/idev/excel/demo/read/CellDataReadDemoData.java renamed to fastexcel-examples/src/test/java/org/apache/fesod/excel/demo/read/CellDataReadDemoData.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
* under the License.
1818
*/
1919

20-
package cn.idev.excel.demo.read;
20+
package org.apache.fesod.excel.demo.read;
2121

22-
import cn.idev.excel.metadata.data.CellData;
2322
import java.util.Date;
2423
import lombok.EqualsAndHashCode;
2524
import lombok.Getter;
2625
import lombok.Setter;
26+
import org.apache.fesod.excel.metadata.data.CellData;
2727

2828
/**
2929
* Basic data class. The order here is consistent with the order in Excel

fastexcel-examples/src/test/java/cn/idev/excel/demo/read/ConverterData.java renamed to fastexcel-examples/src/test/java/org/apache/fesod/excel/demo/read/ConverterData.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
* under the License.
1818
*/
1919

20-
package cn.idev.excel.demo.read;
20+
package org.apache.fesod.excel.demo.read;
2121

22-
import cn.idev.excel.annotation.ExcelProperty;
23-
import cn.idev.excel.annotation.format.DateTimeFormat;
24-
import cn.idev.excel.annotation.format.NumberFormat;
2522
import lombok.EqualsAndHashCode;
2623
import lombok.Getter;
2724
import lombok.Setter;
25+
import org.apache.fesod.excel.annotation.ExcelProperty;
26+
import org.apache.fesod.excel.annotation.format.DateTimeFormat;
27+
import org.apache.fesod.excel.annotation.format.NumberFormat;
2828

2929
/**
3030
* Basic data class. The order here is consistent with the order in the Excel file.

fastexcel-examples/src/test/java/cn/idev/excel/demo/read/ConverterDataListener.java renamed to fastexcel-examples/src/test/java/org/apache/fesod/excel/demo/read/ConverterDataListener.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
* under the License.
1818
*/
1919

20-
package cn.idev.excel.demo.read;
20+
package org.apache.fesod.excel.demo.read;
2121

22-
import cn.idev.excel.context.AnalysisContext;
23-
import cn.idev.excel.read.listener.ReadListener;
24-
import cn.idev.excel.util.ListUtils;
2522
import com.alibaba.fastjson2.JSON;
2623
import java.util.List;
2724
import lombok.extern.slf4j.Slf4j;
25+
import org.apache.fesod.excel.context.AnalysisContext;
26+
import org.apache.fesod.excel.read.listener.ReadListener;
27+
import org.apache.fesod.excel.util.ListUtils;
2828

2929
/**
3030
* Template data reading class

fastexcel-examples/src/test/java/cn/idev/excel/demo/read/CustomStringStringConverter.java renamed to fastexcel-examples/src/test/java/org/apache/fesod/excel/demo/read/CustomStringStringConverter.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
* under the License.
1818
*/
1919

20-
package cn.idev.excel.demo.read;
20+
package org.apache.fesod.excel.demo.read;
2121

22-
import cn.idev.excel.converters.Converter;
23-
import cn.idev.excel.converters.ReadConverterContext;
24-
import cn.idev.excel.converters.WriteConverterContext;
25-
import cn.idev.excel.enums.CellDataTypeEnum;
26-
import cn.idev.excel.metadata.data.WriteCellData;
22+
import org.apache.fesod.excel.converters.Converter;
23+
import org.apache.fesod.excel.converters.ReadConverterContext;
24+
import org.apache.fesod.excel.converters.WriteConverterContext;
25+
import org.apache.fesod.excel.enums.CellDataTypeEnum;
26+
import org.apache.fesod.excel.metadata.data.WriteCellData;
2727

2828
/**
2929
* String and string converter

fastexcel-examples/src/test/java/cn/idev/excel/demo/read/DemoChainAccessorsData.java renamed to fastexcel-examples/src/test/java/org/apache/fesod/excel/demo/read/DemoChainAccessorsData.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package cn.idev.excel.demo.read;
20+
package org.apache.fesod.excel.demo.read;
2121

2222
import java.util.Date;
2323
import lombok.Data;

0 commit comments

Comments
 (0)