diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md index 7348fb743..d74d420cf 100644 --- a/.github/copilot-instructions.md +++ b/.github/copilot-instructions.md @@ -15,7 +15,7 @@ Apache Fesod (Incubating) is a Java library for processing spreadsheets (XLS/XLS ./mvnw clean install -DskipTests # Run tests (must explicitly enable) -./mvnw clean package -Dmaven.test.skip=false -pl fesod-common,fesod-shaded,fesod-sheet,fesod-examples/fesod-sheet-examples +./mvnw clean package -Dmaven.test.skip=false -pl fesod-common,fesod-shaded,fesod-sheet,fesod-examples # Format check / auto-format ./mvnw spotless:check diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cacb75ad0..cb13aad51 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -86,7 +86,7 @@ jobs: restore-keys: | ${{ runner.os }}-m2 - name: Test with Maven - run: ./mvnw clean package -B -Dmaven.test.skip=false -pl fesod-common,fesod-shaded,fesod-sheet,fesod-examples/fesod-sheet-examples + run: ./mvnw clean package -B -Dmaven.test.skip=false -pl fesod-common,fesod-shaded,fesod-sheet,fesod-examples - name: Publish Unit Test Results uses: EnricoMi/publish-unit-test-result-action@v2 if: (!cancelled()) diff --git a/fesod-examples/fesod-sheet-examples/pom.xml b/fesod-examples/fesod-sheet-examples/pom.xml deleted file mode 100644 index 3c01afb2b..000000000 --- a/fesod-examples/fesod-sheet-examples/pom.xml +++ /dev/null @@ -1,105 +0,0 @@ - - - - 4.0.0 - - - org.apache.fesod - fesod-examples - ${revision} - - - fesod-sheet-examples - jar - Fesod Sheet Examples - - - false - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*Test.java - **/*ITCase.java - - - 1 - false - - - - - - - - - org.apache.fesod - fesod-sheet - ${project.version} - - - - ch.qos.logback - logback-classic - ${logback-classic.version} - - - - org.apache.logging.log4j - log4j-to-slf4j - - - - com.alibaba.fastjson2 - fastjson2 - - - - org.springframework.boot - spring-boot-starter-web - - - - org.junit.jupiter - junit-jupiter - test - - - - org.springframework.boot - spring-boot-starter-test - test - - - diff --git a/fesod-examples/pom.xml b/fesod-examples/pom.xml index 4a7fcca4c..b2c33fa28 100644 --- a/fesod-examples/pom.xml +++ b/fesod-examples/pom.xml @@ -29,15 +29,79 @@ fesod-examples - pom + jar Fesod Examples UTF-8 true true + false - - fesod-sheet-examples - + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/*Test.java + **/*ITCase.java + + + 1 + false + + + + + + + + + org.apache.fesod + fesod-sheet + ${project.version} + + + + ch.qos.logback + logback-classic + ${logback-classic.version} + + + + org.apache.logging.log4j + log4j-to-slf4j + + + + com.alibaba.fastjson2 + fastjson2 + + + + org.springframework.boot + spring-boot-starter-web + + + + org.junit.jupiter + junit-jupiter + test + + + + org.springframework.boot + spring-boot-starter-test + test + + diff --git a/fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/advanced/CustomConverterExample.java b/fesod-examples/src/main/java/org/apache/fesod/sheet/examples/advanced/CustomConverterExample.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/advanced/CustomConverterExample.java rename to fesod-examples/src/main/java/org/apache/fesod/sheet/examples/advanced/CustomConverterExample.java diff --git a/fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/advanced/LargeFileWriteExample.java b/fesod-examples/src/main/java/org/apache/fesod/sheet/examples/advanced/LargeFileWriteExample.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/advanced/LargeFileWriteExample.java rename to fesod-examples/src/main/java/org/apache/fesod/sheet/examples/advanced/LargeFileWriteExample.java diff --git a/fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/advanced/PasswordProtectionExample.java b/fesod-examples/src/main/java/org/apache/fesod/sheet/examples/advanced/PasswordProtectionExample.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/advanced/PasswordProtectionExample.java rename to fesod-examples/src/main/java/org/apache/fesod/sheet/examples/advanced/PasswordProtectionExample.java diff --git a/fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/advanced/converter/CustomStringStringConverter.java b/fesod-examples/src/main/java/org/apache/fesod/sheet/examples/advanced/converter/CustomStringStringConverter.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/advanced/converter/CustomStringStringConverter.java rename to fesod-examples/src/main/java/org/apache/fesod/sheet/examples/advanced/converter/CustomStringStringConverter.java diff --git a/fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/advanced/data/CustomConverterData.java b/fesod-examples/src/main/java/org/apache/fesod/sheet/examples/advanced/data/CustomConverterData.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/advanced/data/CustomConverterData.java rename to fesod-examples/src/main/java/org/apache/fesod/sheet/examples/advanced/data/CustomConverterData.java diff --git a/fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/fill/FillBasicExample.java b/fesod-examples/src/main/java/org/apache/fesod/sheet/examples/fill/FillBasicExample.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/fill/FillBasicExample.java rename to fesod-examples/src/main/java/org/apache/fesod/sheet/examples/fill/FillBasicExample.java diff --git a/fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/fill/FillComplexExample.java b/fesod-examples/src/main/java/org/apache/fesod/sheet/examples/fill/FillComplexExample.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/fill/FillComplexExample.java rename to fesod-examples/src/main/java/org/apache/fesod/sheet/examples/fill/FillComplexExample.java diff --git a/fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/fill/data/FillData.java b/fesod-examples/src/main/java/org/apache/fesod/sheet/examples/fill/data/FillData.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/fill/data/FillData.java rename to fesod-examples/src/main/java/org/apache/fesod/sheet/examples/fill/data/FillData.java diff --git a/fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/quickstart/SimpleReadExample.java b/fesod-examples/src/main/java/org/apache/fesod/sheet/examples/quickstart/SimpleReadExample.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/quickstart/SimpleReadExample.java rename to fesod-examples/src/main/java/org/apache/fesod/sheet/examples/quickstart/SimpleReadExample.java diff --git a/fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/quickstart/SimpleWriteExample.java b/fesod-examples/src/main/java/org/apache/fesod/sheet/examples/quickstart/SimpleWriteExample.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/quickstart/SimpleWriteExample.java rename to fesod-examples/src/main/java/org/apache/fesod/sheet/examples/quickstart/SimpleWriteExample.java diff --git a/fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/quickstart/data/DemoData.java b/fesod-examples/src/main/java/org/apache/fesod/sheet/examples/quickstart/data/DemoData.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/quickstart/data/DemoData.java rename to fesod-examples/src/main/java/org/apache/fesod/sheet/examples/quickstart/data/DemoData.java diff --git a/fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/read/BasicReadExample.java b/fesod-examples/src/main/java/org/apache/fesod/sheet/examples/read/BasicReadExample.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/read/BasicReadExample.java rename to fesod-examples/src/main/java/org/apache/fesod/sheet/examples/read/BasicReadExample.java diff --git a/fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/read/ConverterReadExample.java b/fesod-examples/src/main/java/org/apache/fesod/sheet/examples/read/ConverterReadExample.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/read/ConverterReadExample.java rename to fesod-examples/src/main/java/org/apache/fesod/sheet/examples/read/ConverterReadExample.java diff --git a/fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/read/ExceptionHandlingExample.java b/fesod-examples/src/main/java/org/apache/fesod/sheet/examples/read/ExceptionHandlingExample.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/read/ExceptionHandlingExample.java rename to fesod-examples/src/main/java/org/apache/fesod/sheet/examples/read/ExceptionHandlingExample.java diff --git a/fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/read/IndexOrNameReadExample.java b/fesod-examples/src/main/java/org/apache/fesod/sheet/examples/read/IndexOrNameReadExample.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/read/IndexOrNameReadExample.java rename to fesod-examples/src/main/java/org/apache/fesod/sheet/examples/read/IndexOrNameReadExample.java diff --git a/fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/read/MultiSheetReadExample.java b/fesod-examples/src/main/java/org/apache/fesod/sheet/examples/read/MultiSheetReadExample.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/read/MultiSheetReadExample.java rename to fesod-examples/src/main/java/org/apache/fesod/sheet/examples/read/MultiSheetReadExample.java diff --git a/fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/read/NoModelReadExample.java b/fesod-examples/src/main/java/org/apache/fesod/sheet/examples/read/NoModelReadExample.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/read/NoModelReadExample.java rename to fesod-examples/src/main/java/org/apache/fesod/sheet/examples/read/NoModelReadExample.java diff --git a/fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/read/converters/CustomStringStringConverter.java b/fesod-examples/src/main/java/org/apache/fesod/sheet/examples/read/converters/CustomStringStringConverter.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/read/converters/CustomStringStringConverter.java rename to fesod-examples/src/main/java/org/apache/fesod/sheet/examples/read/converters/CustomStringStringConverter.java diff --git a/fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/read/data/ConverterData.java b/fesod-examples/src/main/java/org/apache/fesod/sheet/examples/read/data/ConverterData.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/read/data/ConverterData.java rename to fesod-examples/src/main/java/org/apache/fesod/sheet/examples/read/data/ConverterData.java diff --git a/fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/read/data/DemoDAO.java b/fesod-examples/src/main/java/org/apache/fesod/sheet/examples/read/data/DemoDAO.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/read/data/DemoDAO.java rename to fesod-examples/src/main/java/org/apache/fesod/sheet/examples/read/data/DemoDAO.java diff --git a/fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/read/data/DemoData.java b/fesod-examples/src/main/java/org/apache/fesod/sheet/examples/read/data/DemoData.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/read/data/DemoData.java rename to fesod-examples/src/main/java/org/apache/fesod/sheet/examples/read/data/DemoData.java diff --git a/fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/read/data/ExceptionDemoData.java b/fesod-examples/src/main/java/org/apache/fesod/sheet/examples/read/data/ExceptionDemoData.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/read/data/ExceptionDemoData.java rename to fesod-examples/src/main/java/org/apache/fesod/sheet/examples/read/data/ExceptionDemoData.java diff --git a/fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/read/data/IndexOrNameData.java b/fesod-examples/src/main/java/org/apache/fesod/sheet/examples/read/data/IndexOrNameData.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/read/data/IndexOrNameData.java rename to fesod-examples/src/main/java/org/apache/fesod/sheet/examples/read/data/IndexOrNameData.java diff --git a/fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/read/listeners/DemoDataListener.java b/fesod-examples/src/main/java/org/apache/fesod/sheet/examples/read/listeners/DemoDataListener.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/read/listeners/DemoDataListener.java rename to fesod-examples/src/main/java/org/apache/fesod/sheet/examples/read/listeners/DemoDataListener.java diff --git a/fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/read/listeners/ExceptionListener.java b/fesod-examples/src/main/java/org/apache/fesod/sheet/examples/read/listeners/ExceptionListener.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/read/listeners/ExceptionListener.java rename to fesod-examples/src/main/java/org/apache/fesod/sheet/examples/read/listeners/ExceptionListener.java diff --git a/fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/read/listeners/NoModelDataListener.java b/fesod-examples/src/main/java/org/apache/fesod/sheet/examples/read/listeners/NoModelDataListener.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/read/listeners/NoModelDataListener.java rename to fesod-examples/src/main/java/org/apache/fesod/sheet/examples/read/listeners/NoModelDataListener.java diff --git a/fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/util/ExampleDataGenerator.java b/fesod-examples/src/main/java/org/apache/fesod/sheet/examples/util/ExampleDataGenerator.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/util/ExampleDataGenerator.java rename to fesod-examples/src/main/java/org/apache/fesod/sheet/examples/util/ExampleDataGenerator.java diff --git a/fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/util/ExampleFileUtil.java b/fesod-examples/src/main/java/org/apache/fesod/sheet/examples/util/ExampleFileUtil.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/util/ExampleFileUtil.java rename to fesod-examples/src/main/java/org/apache/fesod/sheet/examples/util/ExampleFileUtil.java diff --git a/fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/web/DownloadData.java b/fesod-examples/src/main/java/org/apache/fesod/sheet/examples/web/DownloadData.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/web/DownloadData.java rename to fesod-examples/src/main/java/org/apache/fesod/sheet/examples/web/DownloadData.java diff --git a/fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/web/FesodWebApplication.java b/fesod-examples/src/main/java/org/apache/fesod/sheet/examples/web/FesodWebApplication.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/web/FesodWebApplication.java rename to fesod-examples/src/main/java/org/apache/fesod/sheet/examples/web/FesodWebApplication.java diff --git a/fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/web/UploadDAO.java b/fesod-examples/src/main/java/org/apache/fesod/sheet/examples/web/UploadDAO.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/web/UploadDAO.java rename to fesod-examples/src/main/java/org/apache/fesod/sheet/examples/web/UploadDAO.java diff --git a/fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/web/UploadData.java b/fesod-examples/src/main/java/org/apache/fesod/sheet/examples/web/UploadData.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/web/UploadData.java rename to fesod-examples/src/main/java/org/apache/fesod/sheet/examples/web/UploadData.java diff --git a/fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/web/UploadDataListener.java b/fesod-examples/src/main/java/org/apache/fesod/sheet/examples/web/UploadDataListener.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/web/UploadDataListener.java rename to fesod-examples/src/main/java/org/apache/fesod/sheet/examples/web/UploadDataListener.java diff --git a/fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/web/WebExampleController.java b/fesod-examples/src/main/java/org/apache/fesod/sheet/examples/web/WebExampleController.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/web/WebExampleController.java rename to fesod-examples/src/main/java/org/apache/fesod/sheet/examples/web/WebExampleController.java diff --git a/fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/write/BasicWriteExample.java b/fesod-examples/src/main/java/org/apache/fesod/sheet/examples/write/BasicWriteExample.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/write/BasicWriteExample.java rename to fesod-examples/src/main/java/org/apache/fesod/sheet/examples/write/BasicWriteExample.java diff --git a/fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/write/ImageWriteExample.java b/fesod-examples/src/main/java/org/apache/fesod/sheet/examples/write/ImageWriteExample.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/write/ImageWriteExample.java rename to fesod-examples/src/main/java/org/apache/fesod/sheet/examples/write/ImageWriteExample.java diff --git a/fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/write/MergeWriteExample.java b/fesod-examples/src/main/java/org/apache/fesod/sheet/examples/write/MergeWriteExample.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/write/MergeWriteExample.java rename to fesod-examples/src/main/java/org/apache/fesod/sheet/examples/write/MergeWriteExample.java diff --git a/fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/write/StyleWriteExample.java b/fesod-examples/src/main/java/org/apache/fesod/sheet/examples/write/StyleWriteExample.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/write/StyleWriteExample.java rename to fesod-examples/src/main/java/org/apache/fesod/sheet/examples/write/StyleWriteExample.java diff --git a/fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/write/data/DemoData.java b/fesod-examples/src/main/java/org/apache/fesod/sheet/examples/write/data/DemoData.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/write/data/DemoData.java rename to fesod-examples/src/main/java/org/apache/fesod/sheet/examples/write/data/DemoData.java diff --git a/fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/write/data/DemoMergeData.java b/fesod-examples/src/main/java/org/apache/fesod/sheet/examples/write/data/DemoMergeData.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/write/data/DemoMergeData.java rename to fesod-examples/src/main/java/org/apache/fesod/sheet/examples/write/data/DemoMergeData.java diff --git a/fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/write/data/DemoStyleData.java b/fesod-examples/src/main/java/org/apache/fesod/sheet/examples/write/data/DemoStyleData.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/write/data/DemoStyleData.java rename to fesod-examples/src/main/java/org/apache/fesod/sheet/examples/write/data/DemoStyleData.java diff --git a/fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/write/data/ImageDemoData.java b/fesod-examples/src/main/java/org/apache/fesod/sheet/examples/write/data/ImageDemoData.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/write/data/ImageDemoData.java rename to fesod-examples/src/main/java/org/apache/fesod/sheet/examples/write/data/ImageDemoData.java diff --git a/fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/write/handlers/CommentWriteHandler.java b/fesod-examples/src/main/java/org/apache/fesod/sheet/examples/write/handlers/CommentWriteHandler.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/write/handlers/CommentWriteHandler.java rename to fesod-examples/src/main/java/org/apache/fesod/sheet/examples/write/handlers/CommentWriteHandler.java diff --git a/fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/write/handlers/CustomCellWriteHandler.java b/fesod-examples/src/main/java/org/apache/fesod/sheet/examples/write/handlers/CustomCellWriteHandler.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/write/handlers/CustomCellWriteHandler.java rename to fesod-examples/src/main/java/org/apache/fesod/sheet/examples/write/handlers/CustomCellWriteHandler.java diff --git a/fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/write/handlers/CustomSheetWriteHandler.java b/fesod-examples/src/main/java/org/apache/fesod/sheet/examples/write/handlers/CustomSheetWriteHandler.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/write/handlers/CustomSheetWriteHandler.java rename to fesod-examples/src/main/java/org/apache/fesod/sheet/examples/write/handlers/CustomSheetWriteHandler.java diff --git a/fesod-examples/fesod-sheet-examples/src/main/resources/application.properties b/fesod-examples/src/main/resources/application.properties similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/resources/application.properties rename to fesod-examples/src/main/resources/application.properties diff --git a/fesod-examples/fesod-sheet-examples/src/main/resources/example/demo.xlsx b/fesod-examples/src/main/resources/example/demo.xlsx similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/resources/example/demo.xlsx rename to fesod-examples/src/main/resources/example/demo.xlsx diff --git a/fesod-examples/fesod-sheet-examples/src/main/resources/example/sample-data/img.jpg b/fesod-examples/src/main/resources/example/sample-data/img.jpg similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/resources/example/sample-data/img.jpg rename to fesod-examples/src/main/resources/example/sample-data/img.jpg diff --git a/fesod-examples/fesod-sheet-examples/src/main/resources/example/templates/list.xlsx b/fesod-examples/src/main/resources/example/templates/list.xlsx similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/resources/example/templates/list.xlsx rename to fesod-examples/src/main/resources/example/templates/list.xlsx diff --git a/fesod-examples/fesod-sheet-examples/src/main/resources/example/templates/simple.xlsx b/fesod-examples/src/main/resources/example/templates/simple.xlsx similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/resources/example/templates/simple.xlsx rename to fesod-examples/src/main/resources/example/templates/simple.xlsx diff --git a/fesod-examples/fesod-sheet-examples/src/main/resources/logback.xml b/fesod-examples/src/main/resources/logback.xml similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/main/resources/logback.xml rename to fesod-examples/src/main/resources/logback.xml diff --git a/fesod-examples/fesod-sheet-examples/src/test/java/org/apache/fesod/sheet/examples/ExampleTestBase.java b/fesod-examples/src/test/java/org/apache/fesod/sheet/examples/ExampleTestBase.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/test/java/org/apache/fesod/sheet/examples/ExampleTestBase.java rename to fesod-examples/src/test/java/org/apache/fesod/sheet/examples/ExampleTestBase.java diff --git a/fesod-examples/fesod-sheet-examples/src/test/java/org/apache/fesod/sheet/examples/advanced/CustomConverterExampleITCase.java b/fesod-examples/src/test/java/org/apache/fesod/sheet/examples/advanced/CustomConverterExampleITCase.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/test/java/org/apache/fesod/sheet/examples/advanced/CustomConverterExampleITCase.java rename to fesod-examples/src/test/java/org/apache/fesod/sheet/examples/advanced/CustomConverterExampleITCase.java diff --git a/fesod-examples/fesod-sheet-examples/src/test/java/org/apache/fesod/sheet/examples/advanced/LargeFileWriteExampleITCase.java b/fesod-examples/src/test/java/org/apache/fesod/sheet/examples/advanced/LargeFileWriteExampleITCase.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/test/java/org/apache/fesod/sheet/examples/advanced/LargeFileWriteExampleITCase.java rename to fesod-examples/src/test/java/org/apache/fesod/sheet/examples/advanced/LargeFileWriteExampleITCase.java diff --git a/fesod-examples/fesod-sheet-examples/src/test/java/org/apache/fesod/sheet/examples/advanced/PasswordProtectionExampleITCase.java b/fesod-examples/src/test/java/org/apache/fesod/sheet/examples/advanced/PasswordProtectionExampleITCase.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/test/java/org/apache/fesod/sheet/examples/advanced/PasswordProtectionExampleITCase.java rename to fesod-examples/src/test/java/org/apache/fesod/sheet/examples/advanced/PasswordProtectionExampleITCase.java diff --git a/fesod-examples/fesod-sheet-examples/src/test/java/org/apache/fesod/sheet/examples/fill/FillBasicExampleITCase.java b/fesod-examples/src/test/java/org/apache/fesod/sheet/examples/fill/FillBasicExampleITCase.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/test/java/org/apache/fesod/sheet/examples/fill/FillBasicExampleITCase.java rename to fesod-examples/src/test/java/org/apache/fesod/sheet/examples/fill/FillBasicExampleITCase.java diff --git a/fesod-examples/fesod-sheet-examples/src/test/java/org/apache/fesod/sheet/examples/fill/FillComplexExampleITCase.java b/fesod-examples/src/test/java/org/apache/fesod/sheet/examples/fill/FillComplexExampleITCase.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/test/java/org/apache/fesod/sheet/examples/fill/FillComplexExampleITCase.java rename to fesod-examples/src/test/java/org/apache/fesod/sheet/examples/fill/FillComplexExampleITCase.java diff --git a/fesod-examples/fesod-sheet-examples/src/test/java/org/apache/fesod/sheet/examples/quickstart/SimpleReadExampleITCase.java b/fesod-examples/src/test/java/org/apache/fesod/sheet/examples/quickstart/SimpleReadExampleITCase.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/test/java/org/apache/fesod/sheet/examples/quickstart/SimpleReadExampleITCase.java rename to fesod-examples/src/test/java/org/apache/fesod/sheet/examples/quickstart/SimpleReadExampleITCase.java diff --git a/fesod-examples/fesod-sheet-examples/src/test/java/org/apache/fesod/sheet/examples/quickstart/SimpleWriteExampleITCase.java b/fesod-examples/src/test/java/org/apache/fesod/sheet/examples/quickstart/SimpleWriteExampleITCase.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/test/java/org/apache/fesod/sheet/examples/quickstart/SimpleWriteExampleITCase.java rename to fesod-examples/src/test/java/org/apache/fesod/sheet/examples/quickstart/SimpleWriteExampleITCase.java diff --git a/fesod-examples/fesod-sheet-examples/src/test/java/org/apache/fesod/sheet/examples/read/ConverterReadExampleITCase.java b/fesod-examples/src/test/java/org/apache/fesod/sheet/examples/read/ConverterReadExampleITCase.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/test/java/org/apache/fesod/sheet/examples/read/ConverterReadExampleITCase.java rename to fesod-examples/src/test/java/org/apache/fesod/sheet/examples/read/ConverterReadExampleITCase.java diff --git a/fesod-examples/fesod-sheet-examples/src/test/java/org/apache/fesod/sheet/examples/read/ExceptionHandlingExampleITCase.java b/fesod-examples/src/test/java/org/apache/fesod/sheet/examples/read/ExceptionHandlingExampleITCase.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/test/java/org/apache/fesod/sheet/examples/read/ExceptionHandlingExampleITCase.java rename to fesod-examples/src/test/java/org/apache/fesod/sheet/examples/read/ExceptionHandlingExampleITCase.java diff --git a/fesod-examples/fesod-sheet-examples/src/test/java/org/apache/fesod/sheet/examples/read/IndexOrNameReadExampleITCase.java b/fesod-examples/src/test/java/org/apache/fesod/sheet/examples/read/IndexOrNameReadExampleITCase.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/test/java/org/apache/fesod/sheet/examples/read/IndexOrNameReadExampleITCase.java rename to fesod-examples/src/test/java/org/apache/fesod/sheet/examples/read/IndexOrNameReadExampleITCase.java diff --git a/fesod-examples/fesod-sheet-examples/src/test/java/org/apache/fesod/sheet/examples/read/MultiSheetReadExampleITCase.java b/fesod-examples/src/test/java/org/apache/fesod/sheet/examples/read/MultiSheetReadExampleITCase.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/test/java/org/apache/fesod/sheet/examples/read/MultiSheetReadExampleITCase.java rename to fesod-examples/src/test/java/org/apache/fesod/sheet/examples/read/MultiSheetReadExampleITCase.java diff --git a/fesod-examples/fesod-sheet-examples/src/test/java/org/apache/fesod/sheet/examples/read/NoModelReadExampleITCase.java b/fesod-examples/src/test/java/org/apache/fesod/sheet/examples/read/NoModelReadExampleITCase.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/test/java/org/apache/fesod/sheet/examples/read/NoModelReadExampleITCase.java rename to fesod-examples/src/test/java/org/apache/fesod/sheet/examples/read/NoModelReadExampleITCase.java diff --git a/fesod-examples/fesod-sheet-examples/src/test/java/org/apache/fesod/sheet/examples/web/FesodWebApplicationITCase.java b/fesod-examples/src/test/java/org/apache/fesod/sheet/examples/web/FesodWebApplicationITCase.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/test/java/org/apache/fesod/sheet/examples/web/FesodWebApplicationITCase.java rename to fesod-examples/src/test/java/org/apache/fesod/sheet/examples/web/FesodWebApplicationITCase.java diff --git a/fesod-examples/fesod-sheet-examples/src/test/java/org/apache/fesod/sheet/examples/write/BasicWriteExampleITCase.java b/fesod-examples/src/test/java/org/apache/fesod/sheet/examples/write/BasicWriteExampleITCase.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/test/java/org/apache/fesod/sheet/examples/write/BasicWriteExampleITCase.java rename to fesod-examples/src/test/java/org/apache/fesod/sheet/examples/write/BasicWriteExampleITCase.java diff --git a/fesod-examples/fesod-sheet-examples/src/test/java/org/apache/fesod/sheet/examples/write/MergeWriteExampleITCase.java b/fesod-examples/src/test/java/org/apache/fesod/sheet/examples/write/MergeWriteExampleITCase.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/test/java/org/apache/fesod/sheet/examples/write/MergeWriteExampleITCase.java rename to fesod-examples/src/test/java/org/apache/fesod/sheet/examples/write/MergeWriteExampleITCase.java diff --git a/fesod-examples/fesod-sheet-examples/src/test/java/org/apache/fesod/sheet/examples/write/StyleWriteExampleITCase.java b/fesod-examples/src/test/java/org/apache/fesod/sheet/examples/write/StyleWriteExampleITCase.java similarity index 100% rename from fesod-examples/fesod-sheet-examples/src/test/java/org/apache/fesod/sheet/examples/write/StyleWriteExampleITCase.java rename to fesod-examples/src/test/java/org/apache/fesod/sheet/examples/write/StyleWriteExampleITCase.java