Skip to content

refactor: rename package structure #682

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
delei merged 3 commits into from
Nov 11, 2025
Merged

refactor: rename package structure #682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
585cf89
refactor: rename package structure from 'excel' to 'sheet' for better…
psxjoy Nov 10, 2025
fb872f8
refactor: reorder import statements for improved organization
psxjoy Nov 10, 2025
9622a3f
refactor: rename FastExcelFactory to FesodSheetFactory and update rel…
psxjoy Nov 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion ...pache/fesod/excel/demo/fill/FillData.java → ...pache/fesod/sheet/demo/fill/FillData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/

package org.apache.fesod.excel.demo.fill;
package org.apache.fesod.sheet.demo.fill;

import java.util.Date;
import lombok.EqualsAndHashCode;
Expand Down
24 changes: 12 additions & 12 deletions ...pache/fesod/excel/demo/fill/FillTest.java → ...pache/fesod/sheet/demo/fill/FillTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,24 @@
* under the License.
*/

package org.apache.fesod.excel.demo.fill;
package org.apache.fesod.sheet.demo.fill;

import java.io.File;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.fesod.excel.ExcelWriter;
import org.apache.fesod.excel.FastExcel;
import org.apache.fesod.excel.enums.WriteDirectionEnum;
import org.apache.fesod.excel.util.ListUtils;
import org.apache.fesod.excel.util.MapUtils;
import org.apache.fesod.excel.util.TestFileUtil;
import org.apache.fesod.excel.write.handler.SheetWriteHandler;
import org.apache.fesod.excel.write.handler.context.SheetWriteHandlerContext;
import org.apache.fesod.excel.write.metadata.WriteSheet;
import org.apache.fesod.excel.write.metadata.fill.FillConfig;
import org.apache.fesod.excel.write.metadata.fill.FillWrapper;
import org.apache.fesod.sheet.ExcelWriter;
import org.apache.fesod.sheet.FastExcel;
import org.apache.fesod.sheet.enums.WriteDirectionEnum;
import org.apache.fesod.sheet.util.ListUtils;
import org.apache.fesod.sheet.util.MapUtils;
import org.apache.fesod.sheet.util.TestFileUtil;
import org.apache.fesod.sheet.write.handler.SheetWriteHandler;
import org.apache.fesod.sheet.write.handler.context.SheetWriteHandlerContext;
import org.apache.fesod.sheet.write.metadata.WriteSheet;
import org.apache.fesod.sheet.write.metadata.fill.FillConfig;
import org.apache.fesod.sheet.write.metadata.fill.FillWrapper;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.util.CellRangeAddress;
import org.junit.jupiter.api.Test;
Expand Down
24 changes: 12 additions & 12 deletions ...ache/fesod/excel/demo/rare/WriteTest.java → ...ache/fesod/sheet/demo/rare/WriteTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,23 @@
* under the License.
*/

package org.apache.fesod.excel.demo.rare;
package org.apache.fesod.sheet.demo.rare;

import java.io.File;
import java.util.Date;
import java.util.List;
import lombok.extern.slf4j.Slf4j;
import org.apache.fesod.excel.ExcelWriter;
import org.apache.fesod.excel.FastExcel;
import org.apache.fesod.excel.demo.read.DemoData;
import org.apache.fesod.excel.util.FileUtils;
import org.apache.fesod.excel.util.ListUtils;
import org.apache.fesod.excel.util.TestFileUtil;
import org.apache.fesod.excel.write.handler.RowWriteHandler;
import org.apache.fesod.excel.write.handler.WorkbookWriteHandler;
import org.apache.fesod.excel.write.handler.context.RowWriteHandlerContext;
import org.apache.fesod.excel.write.handler.context.WorkbookWriteHandlerContext;
import org.apache.fesod.excel.write.metadata.WriteSheet;
import org.apache.fesod.sheet.ExcelWriter;
import org.apache.fesod.sheet.FastExcel;
import org.apache.fesod.sheet.demo.read.DemoData;
import org.apache.fesod.sheet.util.FileUtils;
import org.apache.fesod.sheet.util.ListUtils;
import org.apache.fesod.sheet.util.TestFileUtil;
import org.apache.fesod.sheet.write.handler.RowWriteHandler;
import org.apache.fesod.sheet.write.handler.WorkbookWriteHandler;
import org.apache.fesod.sheet.write.handler.context.RowWriteHandlerContext;
import org.apache.fesod.sheet.write.handler.context.WorkbookWriteHandlerContext;
import org.apache.fesod.sheet.write.metadata.WriteSheet;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
Expand Down
8 changes: 4 additions & 4 deletions ...mo/read/CellDataDemoHeadDataListener.java → ...mo/read/CellDataDemoHeadDataListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
* under the License.
*/

package org.apache.fesod.excel.demo.read;
package org.apache.fesod.sheet.demo.read;

import com.alibaba.fastjson2.JSON;
import java.util.List;
import lombok.extern.slf4j.Slf4j;
import org.apache.fesod.excel.context.AnalysisContext;
import org.apache.fesod.excel.read.listener.ReadListener;
import org.apache.fesod.excel.util.ListUtils;
import org.apache.fesod.sheet.context.AnalysisContext;
import org.apache.fesod.sheet.read.listener.ReadListener;
import org.apache.fesod.sheet.util.ListUtils;

/**
* Read header
Expand Down
4 changes: 2 additions & 2 deletions ...excel/demo/read/CellDataReadDemoData.java → ...sheet/demo/read/CellDataReadDemoData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
* under the License.
*/

package org.apache.fesod.excel.demo.read;
package org.apache.fesod.sheet.demo.read;

import java.util.Date;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
import org.apache.fesod.excel.metadata.data.CellData;
import org.apache.fesod.sheet.metadata.data.CellData;

/**
* Basic data class. The order here is consistent with the order in Excel
Expand Down
8 changes: 4 additions & 4 deletions .../fesod/excel/demo/read/ConverterData.java → .../fesod/sheet/demo/read/ConverterData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
* under the License.
*/

package org.apache.fesod.excel.demo.read;
package org.apache.fesod.sheet.demo.read;

import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
import org.apache.fesod.excel.annotation.ExcelProperty;
import org.apache.fesod.excel.annotation.format.DateTimeFormat;
import org.apache.fesod.excel.annotation.format.NumberFormat;
import org.apache.fesod.sheet.annotation.ExcelProperty;
import org.apache.fesod.sheet.annotation.format.DateTimeFormat;
import org.apache.fesod.sheet.annotation.format.NumberFormat;

/**
* Basic data class. The order here is consistent with the order in the Excel file.
Expand Down
8 changes: 4 additions & 4 deletions ...xcel/demo/read/ConverterDataListener.java → ...heet/demo/read/ConverterDataListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
* under the License.
*/

package org.apache.fesod.excel.demo.read;
package org.apache.fesod.sheet.demo.read;

import com.alibaba.fastjson2.JSON;
import java.util.List;
import lombok.extern.slf4j.Slf4j;
import org.apache.fesod.excel.context.AnalysisContext;
import org.apache.fesod.excel.read.listener.ReadListener;
import org.apache.fesod.excel.util.ListUtils;
import org.apache.fesod.sheet.context.AnalysisContext;
import org.apache.fesod.sheet.read.listener.ReadListener;
import org.apache.fesod.sheet.util.ListUtils;

/**
* Template data reading class
Expand Down
12 changes: 6 additions & 6 deletions ...emo/read/CustomStringStringConverter.java → ...emo/read/CustomStringStringConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
* under the License.
*/

package org.apache.fesod.excel.demo.read;
package org.apache.fesod.sheet.demo.read;

import org.apache.fesod.excel.converters.Converter;
import org.apache.fesod.excel.converters.ReadConverterContext;
import org.apache.fesod.excel.converters.WriteConverterContext;
import org.apache.fesod.excel.enums.CellDataTypeEnum;
import org.apache.fesod.excel.metadata.data.WriteCellData;
import org.apache.fesod.sheet.converters.Converter;
import org.apache.fesod.sheet.converters.ReadConverterContext;
import org.apache.fesod.sheet.converters.WriteConverterContext;
import org.apache.fesod.sheet.enums.CellDataTypeEnum;
import org.apache.fesod.sheet.metadata.data.WriteCellData;

/**
* String and string converter
Expand Down
2 changes: 1 addition & 1 deletion ...cel/demo/read/DemoChainAccessorsData.java → ...eet/demo/read/DemoChainAccessorsData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/

package org.apache.fesod.excel.demo.read;
package org.apache.fesod.sheet.demo.read;

import java.util.Date;
import lombok.Data;
Expand Down
4 changes: 2 additions & 2 deletions ...l/demo/read/DemoCompatibleHeaderData.java → ...t/demo/read/DemoCompatibleHeaderData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
* under the License.
*/

package org.apache.fesod.excel.demo.read;
package org.apache.fesod.sheet.demo.read;

import java.util.Date;
import lombok.Data;
import org.apache.fesod.excel.annotation.ExcelProperty;
import org.apache.fesod.sheet.annotation.ExcelProperty;

/**
* Compatible header data class.
Expand Down
10 changes: 5 additions & 5 deletions ...ead/DemoCompatibleHeaderDataListener.java → ...ead/DemoCompatibleHeaderDataListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@
* under the License.
*/

package org.apache.fesod.excel.demo.read;
package org.apache.fesod.sheet.demo.read;

import com.alibaba.fastjson2.JSON;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import lombok.extern.slf4j.Slf4j;
import org.apache.fesod.excel.context.AnalysisContext;
import org.apache.fesod.excel.event.AnalysisEventListener;
import org.apache.fesod.excel.metadata.data.ReadCellData;
import org.apache.fesod.excel.util.ListUtils;
import org.apache.fesod.sheet.context.AnalysisContext;
import org.apache.fesod.sheet.event.AnalysisEventListener;
import org.apache.fesod.sheet.metadata.data.ReadCellData;
import org.apache.fesod.sheet.util.ListUtils;

/**
* Listener to read headers with compatibility for both Chinese and English.
Expand Down
2 changes: 1 addition & 1 deletion ...apache/fesod/excel/demo/read/DemoDAO.java → ...apache/fesod/sheet/demo/read/DemoDAO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/

package org.apache.fesod.excel.demo.read;
package org.apache.fesod.sheet.demo.read;

import java.util.List;

Expand Down
2 changes: 1 addition & 1 deletion ...pache/fesod/excel/demo/read/DemoData.java → ...pache/fesod/sheet/demo/read/DemoData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/

package org.apache.fesod.excel.demo.read;
package org.apache.fesod.sheet.demo.read;

import java.util.Date;
import lombok.EqualsAndHashCode;
Expand Down
2 changes: 1 addition & 1 deletion ...esod/excel/demo/read/DemoDataAnother.java → ...esod/sheet/demo/read/DemoDataAnother.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/

package org.apache.fesod.excel.demo.read;
package org.apache.fesod.sheet.demo.read;

import lombok.EqualsAndHashCode;
import lombok.Getter;
Expand Down
8 changes: 4 additions & 4 deletions ...sod/excel/demo/read/DemoDataListener.java → ...sod/sheet/demo/read/DemoDataListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
* under the License.
*/

package org.apache.fesod.excel.demo.read;
package org.apache.fesod.sheet.demo.read;

import com.alibaba.fastjson2.JSON;
import java.util.List;
import lombok.extern.slf4j.Slf4j;
import org.apache.fesod.excel.context.AnalysisContext;
import org.apache.fesod.excel.read.listener.ReadListener;
import org.apache.fesod.excel.util.ListUtils;
import org.apache.fesod.sheet.context.AnalysisContext;
import org.apache.fesod.sheet.read.listener.ReadListener;
import org.apache.fesod.sheet.util.ListUtils;

/**
* Template reading class
Expand Down
12 changes: 6 additions & 6 deletions ...xcel/demo/read/DemoExceptionListener.java → ...heet/demo/read/DemoExceptionListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@
* under the License.
*/

package org.apache.fesod.excel.demo.read;
package org.apache.fesod.sheet.demo.read;

import com.alibaba.fastjson2.JSON;
import java.util.List;
import java.util.Map;
import lombok.extern.slf4j.Slf4j;
import org.apache.fesod.excel.context.AnalysisContext;
import org.apache.fesod.excel.exception.ExcelDataConvertException;
import org.apache.fesod.excel.metadata.data.ReadCellData;
import org.apache.fesod.excel.read.listener.ReadListener;
import org.apache.fesod.excel.util.ListUtils;
import org.apache.fesod.sheet.context.AnalysisContext;
import org.apache.fesod.sheet.exception.ExcelDataConvertException;
import org.apache.fesod.sheet.metadata.data.ReadCellData;
import org.apache.fesod.sheet.read.listener.ReadListener;
import org.apache.fesod.sheet.util.ListUtils;

/**
* Read and convert exceptions.
Expand Down
2 changes: 1 addition & 1 deletion .../fesod/excel/demo/read/DemoExtraData.java → .../fesod/sheet/demo/read/DemoExtraData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/

package org.apache.fesod.excel.demo.read;
package org.apache.fesod.sheet.demo.read;

import lombok.EqualsAndHashCode;
import lombok.Getter;
Expand Down
8 changes: 4 additions & 4 deletions ...od/excel/demo/read/DemoExtraListener.java → ...od/sheet/demo/read/DemoExtraListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
* under the License.
*/

package org.apache.fesod.excel.demo.read;
package org.apache.fesod.sheet.demo.read;

import com.alibaba.fastjson2.JSON;
import lombok.extern.slf4j.Slf4j;
import org.apache.fesod.excel.context.AnalysisContext;
import org.apache.fesod.excel.metadata.CellExtra;
import org.apache.fesod.excel.read.listener.ReadListener;
import org.apache.fesod.sheet.context.AnalysisContext;
import org.apache.fesod.sheet.metadata.CellExtra;
import org.apache.fesod.sheet.read.listener.ReadListener;
import org.junit.jupiter.api.Assertions;

/**
Expand Down
12 changes: 6 additions & 6 deletions ...excel/demo/read/DemoHeadDataListener.java → ...sheet/demo/read/DemoHeadDataListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@
* under the License.
*/

package org.apache.fesod.excel.demo.read;
package org.apache.fesod.sheet.demo.read;

import com.alibaba.fastjson2.JSON;
import java.util.List;
import java.util.Map;
import lombok.extern.slf4j.Slf4j;
import org.apache.fesod.excel.context.AnalysisContext;
import org.apache.fesod.excel.exception.ExcelDataConvertException;
import org.apache.fesod.excel.metadata.data.ReadCellData;
import org.apache.fesod.excel.read.listener.ReadListener;
import org.apache.fesod.excel.util.ListUtils;
import org.apache.fesod.sheet.context.AnalysisContext;
import org.apache.fesod.sheet.exception.ExcelDataConvertException;
import org.apache.fesod.sheet.metadata.data.ReadCellData;
import org.apache.fesod.sheet.read.listener.ReadListener;
import org.apache.fesod.sheet.util.ListUtils;

/**
* Reading headers
Expand Down
2 changes: 1 addition & 1 deletion ...od/excel/demo/read/ExceptionDemoData.java → ...od/sheet/demo/read/ExceptionDemoData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/

package org.apache.fesod.excel.demo.read;
package org.apache.fesod.sheet.demo.read;

import java.util.Date;
import lombok.EqualsAndHashCode;
Expand Down
6 changes: 3 additions & 3 deletions ...o/read/GenericHeaderTypeDataListener.java → ...o/read/GenericHeaderTypeDataListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
* under the License.
*/

package org.apache.fesod.excel.demo.read;
package org.apache.fesod.sheet.demo.read;

import lombok.extern.slf4j.Slf4j;
import org.apache.fesod.excel.context.AnalysisContext;
import org.apache.fesod.excel.read.listener.ReadListener;
import org.apache.fesod.sheet.context.AnalysisContext;
import org.apache.fesod.sheet.read.listener.ReadListener;

/**
* A data listener example that specifies the header type through generics.
Expand Down
4 changes: 2 additions & 2 deletions ...esod/excel/demo/read/IndexOrNameData.java → ...esod/sheet/demo/read/IndexOrNameData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
* under the License.
*/

package org.apache.fesod.excel.demo.read;
package org.apache.fesod.sheet.demo.read;

import java.util.Date;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
import org.apache.fesod.excel.annotation.ExcelProperty;
import org.apache.fesod.sheet.annotation.ExcelProperty;

/**
* Basic data class
Expand Down
Loading
Loading