diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelUtil.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelUtil.java index 02e192878..4d9662e86 100644 --- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelUtil.java +++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelUtil.java @@ -17,6 +17,7 @@ import org.dromara.hutool.core.io.IoUtil; import org.dromara.hutool.core.io.file.FileUtil; import org.dromara.hutool.core.util.ObjUtil; import org.dromara.hutool.poi.PoiChecker; +import org.dromara.hutool.poi.excel.reader.ExcelReader; import org.dromara.hutool.poi.excel.sax.ExcelSaxReader; import org.dromara.hutool.poi.excel.sax.ExcelSaxUtil; import org.dromara.hutool.poi.excel.sax.handler.RowHandler; diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelReader.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/ExcelReader.java similarity index 97% rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelReader.java rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/ExcelReader.java index d4c430433..4181b978d 100644 --- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelReader.java +++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/ExcelReader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 looly(loolly@aliyun.com) + * Copyright (c) 2024. looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: @@ -10,19 +10,15 @@ * See the Mulan PSL v2 for more details. */ -package org.dromara.hutool.poi.excel; +package org.dromara.hutool.poi.excel.reader; import org.dromara.hutool.core.io.IoUtil; import org.dromara.hutool.core.io.file.FileUtil; import org.dromara.hutool.core.lang.Assert; import org.dromara.hutool.core.func.SerBiConsumer; +import org.dromara.hutool.poi.excel.*; import org.dromara.hutool.poi.excel.cell.CellEditor; import org.dromara.hutool.poi.excel.cell.CellUtil; -import org.dromara.hutool.poi.excel.reader.BeanSheetReader; -import org.dromara.hutool.poi.excel.reader.ColumnSheetReader; -import org.dromara.hutool.poi.excel.reader.ListSheetReader; -import org.dromara.hutool.poi.excel.reader.MapSheetReader; -import org.dromara.hutool.poi.excel.reader.SheetReader; import org.apache.poi.ss.extractor.ExcelExtractor; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/ExcelUtilTest.java b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/ExcelUtilTest.java index 4526ff5de..0d6648b91 100644 --- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/ExcelUtilTest.java +++ b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/ExcelUtilTest.java @@ -14,6 +14,7 @@ package org.dromara.hutool.poi.excel; import org.apache.poi.ss.util.CellReference; import org.dromara.hutool.poi.excel.cell.CellReferenceUtil; +import org.dromara.hutool.poi.excel.reader.ExcelReader; import org.dromara.hutool.poi.excel.writer.ExcelWriter; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/NumericCellValueTest.java b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/NumericCellValueTest.java index 67c894fd1..6f9ea8dc2 100644 --- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/NumericCellValueTest.java +++ b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/NumericCellValueTest.java @@ -14,6 +14,7 @@ package org.dromara.hutool.poi.excel; import org.apache.poi.ss.usermodel.Cell; import org.dromara.hutool.poi.excel.cell.values.NumericCellValue; +import org.dromara.hutool.poi.excel.reader.ExcelReader; import org.dromara.hutool.poi.excel.writer.ExcelWriter; import org.junit.jupiter.api.Test; diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/CellEditorTest.java b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/CellEditorTest.java index cd60a9dce..bcacecd55 100644 --- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/CellEditorTest.java +++ b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/CellEditorTest.java @@ -12,7 +12,6 @@ package org.dromara.hutool.poi.excel.reader; -import org.dromara.hutool.poi.excel.ExcelReader; import org.dromara.hutool.poi.excel.ExcelUtil; import org.dromara.hutool.poi.excel.cell.CellEditor; import lombok.AllArgsConstructor; diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/ExcelReadTest.java b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/ExcelReadTest.java index e8e27f1c9..6b5c2394e 100644 --- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/ExcelReadTest.java +++ b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/ExcelReadTest.java @@ -19,7 +19,6 @@ import org.dromara.hutool.core.map.MapUtil; import org.dromara.hutool.core.util.ObjUtil; import lombok.Data; import org.apache.poi.ss.usermodel.Cell; -import org.dromara.hutool.poi.excel.ExcelReader; import org.dromara.hutool.poi.excel.ExcelUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/Issue1729Test.java b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/Issue1729Test.java index e149ca397..dfd4e84f8 100644 --- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/Issue1729Test.java +++ b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/Issue1729Test.java @@ -13,7 +13,6 @@ package org.dromara.hutool.poi.excel.reader; import lombok.Data; -import org.dromara.hutool.poi.excel.ExcelReader; import org.dromara.hutool.poi.excel.ExcelUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/Issue3118Test.java b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/Issue3118Test.java index 38d5a5369..c67441962 100644 --- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/Issue3118Test.java +++ b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/Issue3118Test.java @@ -13,7 +13,6 @@ package org.dromara.hutool.poi.excel.reader; import org.dromara.hutool.core.lang.Console; -import org.dromara.hutool.poi.excel.ExcelReader; import org.dromara.hutool.poi.excel.ExcelUtil; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/Issue3120Test.java b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/Issue3120Test.java index 51f80630d..cc5e404b4 100644 --- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/Issue3120Test.java +++ b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/Issue3120Test.java @@ -12,7 +12,6 @@ package org.dromara.hutool.poi.excel.reader; -import org.dromara.hutool.poi.excel.ExcelReader; import org.dromara.hutool.poi.excel.ExcelUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/Issue3481Test.java b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/Issue3481Test.java index 930afe9c6..1de4026b2 100644 --- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/Issue3481Test.java +++ b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/Issue3481Test.java @@ -1,6 +1,5 @@ package org.dromara.hutool.poi.excel.reader; -import org.dromara.hutool.poi.excel.ExcelReader; import org.dromara.hutool.poi.excel.ExcelUtil; import org.dromara.hutool.poi.excel.writer.ExcelWriter; import org.junit.jupiter.api.Disabled; diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/IssueI5Q1TWTest.java b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/IssueI5Q1TWTest.java index f318aab47..71e960eda 100644 --- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/IssueI5Q1TWTest.java +++ b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/IssueI5Q1TWTest.java @@ -12,7 +12,6 @@ package org.dromara.hutool.poi.excel.reader; -import org.dromara.hutool.poi.excel.ExcelReader; import org.dromara.hutool.poi.excel.ExcelUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/IssueI5U1JATest.java b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/IssueI5U1JATest.java index 4128376f9..e49b52caa 100644 --- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/IssueI5U1JATest.java +++ b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/IssueI5U1JATest.java @@ -12,7 +12,6 @@ package org.dromara.hutool.poi.excel.reader; -import org.dromara.hutool.poi.excel.ExcelReader; import org.dromara.hutool.poi.excel.ExcelUtil; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/IssueI8PT9ZTest.java b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/IssueI8PT9ZTest.java index 6eadbcd4c..297213e3f 100644 --- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/IssueI8PT9ZTest.java +++ b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/IssueI8PT9ZTest.java @@ -3,7 +3,6 @@ package org.dromara.hutool.poi.excel.reader; import lombok.Data; import org.dromara.hutool.core.annotation.Alias; import org.dromara.hutool.core.lang.Console; -import org.dromara.hutool.poi.excel.ExcelReader; import org.dromara.hutool.poi.excel.ExcelUtil; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/IssueI8ZIQCTest.java b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/IssueI8ZIQCTest.java index cc1e33cde..606eb7e73 100644 --- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/IssueI8ZIQCTest.java +++ b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/IssueI8ZIQCTest.java @@ -1,6 +1,5 @@ package org.dromara.hutool.poi.excel.reader; -import org.dromara.hutool.poi.excel.ExcelReader; import org.dromara.hutool.poi.excel.ExcelUtil; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/ExcelWriteTest.java b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/ExcelWriteTest.java index 0dda8c7ca..d5dd5c500 100644 --- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/ExcelWriteTest.java +++ b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/ExcelWriteTest.java @@ -27,6 +27,7 @@ import org.dromara.hutool.core.util.CharsetUtil; import org.dromara.hutool.core.util.ObjUtil; import org.dromara.hutool.poi.excel.*; import org.dromara.hutool.poi.excel.cell.setters.EscapeStrCellSetter; +import org.dromara.hutool.poi.excel.reader.ExcelReader; import org.dromara.hutool.poi.excel.style.DefaultStyleSet; import org.dromara.hutool.poi.excel.style.StyleUtil; import org.junit.jupiter.api.Assertions;