+ * This class will be removed in future versions. + *
*/ @Deprecated -public class EasyExcel extends FesodSheetFactory {} +public class EasyExcel extends FesodSheet {} diff --git a/fesod/src/main/java/org/apache/fesod/sheet/FastExcel.java b/fesod/src/main/java/org/apache/fesod/sheet/FastExcel.java index b7c8ac970..770808366 100644 --- a/fesod/src/main/java/org/apache/fesod/sheet/FastExcel.java +++ b/fesod/src/main/java/org/apache/fesod/sheet/FastExcel.java @@ -20,8 +20,11 @@ package org.apache.fesod.sheet; /** - * This is actually {@link FastExcelFactory}, and short names look better. - * + * An alias class for {@link FesodSheet}. + * This class is deprecated; use {@link FesodSheet} instead. + *+ * This class will be removed in future versions. + *
*/ @Deprecated -public class FastExcel extends FesodSheetFactory {} +public class FastExcel extends FesodSheet {} diff --git a/fesod/src/main/java/org/apache/fesod/sheet/FastExcelFactory.java b/fesod/src/main/java/org/apache/fesod/sheet/FastExcelFactory.java index 7560e993d..60822aa6e 100644 --- a/fesod/src/main/java/org/apache/fesod/sheet/FastExcelFactory.java +++ b/fesod/src/main/java/org/apache/fesod/sheet/FastExcelFactory.java @@ -20,7 +20,11 @@ package org.apache.fesod.sheet; /** - * Reader and writer factory class + * An alias class for {@link FesodSheet}. + * This class is deprecated; use {@link FesodSheet} instead. + *+ * This class will be removed in future versions. + *
*/ @Deprecated -public class FastExcelFactory extends FesodSheetFactory {} +public class FastExcelFactory extends FesodSheet {} diff --git a/fesod/src/main/java/org/apache/fesod/sheet/FesodSheet.java b/fesod/src/main/java/org/apache/fesod/sheet/FesodSheet.java index e0e18fc56..2422718a3 100644 --- a/fesod/src/main/java/org/apache/fesod/sheet/FesodSheet.java +++ b/fesod/src/main/java/org/apache/fesod/sheet/FesodSheet.java @@ -19,7 +19,315 @@ package org.apache.fesod.sheet; +import java.io.File; +import java.io.InputStream; +import java.io.OutputStream; +import org.apache.fesod.sheet.read.builder.ExcelReaderBuilder; +import org.apache.fesod.sheet.read.builder.ExcelReaderSheetBuilder; +import org.apache.fesod.sheet.read.listener.ReadListener; +import org.apache.fesod.sheet.write.builder.ExcelWriterBuilder; +import org.apache.fesod.sheet.write.builder.ExcelWriterSheetBuilder; +import org.apache.fesod.sheet.write.builder.ExcelWriterTableBuilder; + /** - * This is actually {@link FesodSheetFactory}, and short names look better. + * Core classes of the Fesod spreadsheet processor */ -public class FesodSheet extends FesodSheetFactory {} +public class FesodSheet { + + /** + * Build excel the write + * + * @return + */ + public static ExcelWriterBuilder write() { + return new ExcelWriterBuilder(); + } + + /** + * Build excel the write + * + * @param file File to write + * @return Excel writer builder + */ + public static ExcelWriterBuilder write(File file) { + return write(file, null); + } + + /** + * Build excel the write + * + * @param file File to write + * @param head Annotate the class for configuration information + * @return Excel writer builder + */ + public static ExcelWriterBuilder write(File file, Class head) { + return new ExcelWriterBuilder().file(file).headIfNotNull(head); + } + + /** + * Build excel the write + * + * @param pathName File path to write + * @return Excel writer builder + */ + public static ExcelWriterBuilder write(String pathName) { + return write(pathName, null); + } + + /** + * Build excel the write + * + * @param pathName File path to write + * @param head Annotate the class for configuration information + * @return Excel writer builder + */ + public static ExcelWriterBuilder write(String pathName, Class head) { + return new ExcelWriterBuilder().file(pathName).headIfNotNull(head); + } + + /** + * Build excel the write + * + * @param outputStream Output stream to write + * @return Excel writer builder + */ + public static ExcelWriterBuilder write(OutputStream outputStream) { + return write(outputStream, null); + } + + /** + * Build excel the write + * + * @param outputStream Output stream to write + * @param head Annotate the class for configuration information. + * @return Excel writer builder + */ + public static ExcelWriterBuilder write(OutputStream outputStream, Class head) { + return new ExcelWriterBuilder().file(outputStream).headIfNotNull(head); + } + + /** + * Build excel thewriterSheet
+ *
+ * @return Excel sheet writer builder
+ */
+ public static ExcelWriterSheetBuilder writerSheet() {
+ return writerSheet(null, null);
+ }
+
+ /**
+ * Build excel the writerSheet
+ *
+ * @param sheetNo Index of sheet,0 base.
+ * @return Excel sheet writer builder.
+ */
+ public static ExcelWriterSheetBuilder writerSheet(Integer sheetNo) {
+ return writerSheet(sheetNo, null);
+ }
+
+ /**
+ * Build excel the 'writerSheet'
+ *
+ * @param sheetName The name of sheet.
+ * @return Excel sheet writer builder.
+ */
+ public static ExcelWriterSheetBuilder writerSheet(String sheetName) {
+ return writerSheet(null, sheetName);
+ }
+
+ /**
+ * Build excel the 'writerSheet'
+ *
+ * @param sheetNo Index of sheet,0 base.
+ * @param sheetName The name of sheet.
+ * @return Excel sheet writer builder.
+ */
+ public static ExcelWriterSheetBuilder writerSheet(Integer sheetNo, String sheetName) {
+ return new ExcelWriterSheetBuilder().sheetNoIfNotNull(sheetNo).sheetNameIfNotNull(sheetName);
+ }
+
+ /**
+ * Build excel the writerTable
+ *
+ * @return Excel table writer builder.
+ */
+ public static ExcelWriterTableBuilder writerTable() {
+ return writerTable(null);
+ }
+
+ /**
+ * Build excel the 'writerTable'
+ *
+ * @param tableNo Index of table,0 base.
+ * @return Excel table writer builder.
+ */
+ public static ExcelWriterTableBuilder writerTable(Integer tableNo) {
+ return new ExcelWriterTableBuilder().tableNoIfNotNull(tableNo);
+ }
+
+ /**
+ * Build excel the read
+ *
+ * @return Excel reader builder.
+ */
+ public static ExcelReaderBuilder read() {
+ return new ExcelReaderBuilder();
+ }
+
+ /**
+ * Build excel the read
+ *
+ * @param file File to read.
+ * @return Excel reader builder.
+ */
+ public static ExcelReaderBuilder read(File file) {
+ return read(file, null, null);
+ }
+
+ /**
+ * Build excel the read
+ *
+ * @param file File to read.
+ * @param readListener Read listener.
+ * @return Excel reader builder.
+ */
+ public static ExcelReaderBuilder read(File file, ReadListener readListener) {
+ return read(file, null, readListener);
+ }
+
+ /**
+ * Build excel the read
+ *
+ * @param file File to read.
+ * @param head Annotate the class for configuration information.
+ * @param readListener Read listener.
+ * @return Excel reader builder.
+ */
+ public static ExcelReaderBuilder read(File file, Class head, ReadListener readListener) {
+ return new ExcelReaderBuilder().file(file).headIfNotNull(head).registerReadListenerIfNotNull(readListener);
+ }
+
+ /**
+ * Build excel the read
+ *
+ * @param pathName File path to read.
+ * @return Excel reader builder.
+ */
+ public static ExcelReaderBuilder read(String pathName) {
+ return read(pathName, null, null);
+ }
+
+ /**
+ * Build excel the read
+ *
+ * @param pathName File path to read.
+ * @param readListener Read listener.
+ * @return Excel reader builder.
+ */
+ public static ExcelReaderBuilder read(String pathName, ReadListener readListener) {
+ return read(pathName, null, readListener);
+ }
+
+ /**
+ * Build excel the read
+ *
+ * @param pathName File path to read.
+ * @param head Annotate the class for configuration information.
+ * @param readListener Read listener.
+ * @return Excel reader builder.
+ */
+ public static ExcelReaderBuilder read(String pathName, Class head, ReadListener readListener) {
+ return new ExcelReaderBuilder().file(pathName).headIfNotNull(head).registerReadListenerIfNotNull(readListener);
+ }
+
+ /**
+ * Build excel the read
+ *
+ * @param inputStream Input stream to read.
+ * @return Excel reader builder.
+ */
+ public static ExcelReaderBuilder read(InputStream inputStream) {
+ return read(inputStream, null, null);
+ }
+
+ /**
+ * Build excel the read
+ *
+ * @param inputStream Input stream to read.
+ * @param readListener Read listener.
+ * @return Excel reader builder.
+ */
+ public static ExcelReaderBuilder read(InputStream inputStream, ReadListener readListener) {
+ return read(inputStream, null, readListener);
+ }
+
+ /**
+ * Build excel the read
+ *
+ * @param inputStream Input stream to read.
+ * @param head Annotate the class for configuration information.
+ * @param readListener Read listener.
+ * @return Excel reader builder.
+ */
+ public static ExcelReaderBuilder read(InputStream inputStream, Class head, ReadListener readListener) {
+ return new ExcelReaderBuilder()
+ .file(inputStream)
+ .headIfNotNull(head)
+ .registerReadListenerIfNotNull(readListener);
+ }
+
+ /**
+ * Build excel the 'readSheet'
+ *
+ * @return Excel sheet reader builder.
+ */
+ public static ExcelReaderSheetBuilder readSheet() {
+ return readSheet(null, null);
+ }
+
+ /**
+ * Build excel the 'readSheet'
+ *
+ * @param sheetNo Index of sheet,0 base.
+ * @return Excel sheet reader builder.
+ */
+ public static ExcelReaderSheetBuilder readSheet(Integer sheetNo) {
+ return readSheet(sheetNo, null);
+ }
+
+ /**
+ * Build excel the 'readSheet'
+ *
+ * @param sheetName The name of sheet.
+ * @return Excel sheet reader builder.
+ */
+ public static ExcelReaderSheetBuilder readSheet(String sheetName) {
+ return readSheet(null, sheetName);
+ }
+
+ /**
+ * Build excel the 'readSheet'
+ *
+ * @param sheetNo Index of sheet,0 base.
+ * @param sheetName The name of sheet.
+ * @return Excel sheet reader builder.
+ */
+ public static ExcelReaderSheetBuilder readSheet(Integer sheetNo, String sheetName) {
+ return readSheet(sheetNo, sheetName, null);
+ }
+
+ /**
+ * Build excel the 'readSheet'
+ *
+ * @param sheetNo Index of sheet,0 base.
+ * @param sheetName The name of sheet.
+ * @param numRows The number of rows to read, the default is all, start with 0.
+ * @return
+ */
+ public static ExcelReaderSheetBuilder readSheet(Integer sheetNo, String sheetName, Integer numRows) {
+ return new ExcelReaderSheetBuilder()
+ .sheetNoIfNotNull(sheetNo)
+ .sheetNameIfNotNull(sheetName)
+ .numRowsIfNotNull(numRows);
+ }
+}
diff --git a/fesod/src/main/java/org/apache/fesod/sheet/FesodSheetFactory.java b/fesod/src/main/java/org/apache/fesod/sheet/FesodSheetFactory.java
deleted file mode 100644
index c79b9915d..000000000
--- a/fesod/src/main/java/org/apache/fesod/sheet/FesodSheetFactory.java
+++ /dev/null
@@ -1,333 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.fesod.sheet;
-
-import java.io.File;
-import java.io.InputStream;
-import java.io.OutputStream;
-import org.apache.fesod.sheet.read.builder.ExcelReaderBuilder;
-import org.apache.fesod.sheet.read.builder.ExcelReaderSheetBuilder;
-import org.apache.fesod.sheet.read.listener.ReadListener;
-import org.apache.fesod.sheet.write.builder.ExcelWriterBuilder;
-import org.apache.fesod.sheet.write.builder.ExcelWriterSheetBuilder;
-import org.apache.fesod.sheet.write.builder.ExcelWriterTableBuilder;
-
-/**
- * Reader and writer factory class
- */
-public class FesodSheetFactory {
-
- /**
- * Build excel the write
- *
- * @return
- */
- public static ExcelWriterBuilder write() {
- return new ExcelWriterBuilder();
- }
-
- /**
- * Build excel the write
- *
- * @param file File to write
- * @return Excel writer builder
- */
- public static ExcelWriterBuilder write(File file) {
- return write(file, null);
- }
-
- /**
- * Build excel the write
- *
- * @param file File to write
- * @param head Annotate the class for configuration information
- * @return Excel writer builder
- */
- public static ExcelWriterBuilder write(File file, Class head) {
- return new ExcelWriterBuilder().file(file).headIfNotNull(head);
- }
-
- /**
- * Build excel the write
- *
- * @param pathName File path to write
- * @return Excel writer builder
- */
- public static ExcelWriterBuilder write(String pathName) {
- return write(pathName, null);
- }
-
- /**
- * Build excel the write
- *
- * @param pathName File path to write
- * @param head Annotate the class for configuration information
- * @return Excel writer builder
- */
- public static ExcelWriterBuilder write(String pathName, Class head) {
- return new ExcelWriterBuilder().file(pathName).headIfNotNull(head);
- }
-
- /**
- * Build excel the write
- *
- * @param outputStream Output stream to write
- * @return Excel writer builder
- */
- public static ExcelWriterBuilder write(OutputStream outputStream) {
- return write(outputStream, null);
- }
-
- /**
- * Build excel the write
- *
- * @param outputStream Output stream to write
- * @param head Annotate the class for configuration information.
- * @return Excel writer builder
- */
- public static ExcelWriterBuilder write(OutputStream outputStream, Class head) {
- return new ExcelWriterBuilder().file(outputStream).headIfNotNull(head);
- }
-
- /**
- * Build excel the writerSheet
- *
- * @return Excel sheet writer builder
- */
- public static ExcelWriterSheetBuilder writerSheet() {
- return writerSheet(null, null);
- }
-
- /**
- * Build excel the writerSheet
- *
- * @param sheetNo Index of sheet,0 base.
- * @return Excel sheet writer builder.
- */
- public static ExcelWriterSheetBuilder writerSheet(Integer sheetNo) {
- return writerSheet(sheetNo, null);
- }
-
- /**
- * Build excel the 'writerSheet'
- *
- * @param sheetName The name of sheet.
- * @return Excel sheet writer builder.
- */
- public static ExcelWriterSheetBuilder writerSheet(String sheetName) {
- return writerSheet(null, sheetName);
- }
-
- /**
- * Build excel the 'writerSheet'
- *
- * @param sheetNo Index of sheet,0 base.
- * @param sheetName The name of sheet.
- * @return Excel sheet writer builder.
- */
- public static ExcelWriterSheetBuilder writerSheet(Integer sheetNo, String sheetName) {
- return new ExcelWriterSheetBuilder().sheetNoIfNotNull(sheetNo).sheetNameIfNotNull(sheetName);
- }
-
- /**
- * Build excel the writerTable
- *
- * @return Excel table writer builder.
- */
- public static ExcelWriterTableBuilder writerTable() {
- return writerTable(null);
- }
-
- /**
- * Build excel the 'writerTable'
- *
- * @param tableNo Index of table,0 base.
- * @return Excel table writer builder.
- */
- public static ExcelWriterTableBuilder writerTable(Integer tableNo) {
- return new ExcelWriterTableBuilder().tableNoIfNotNull(tableNo);
- }
-
- /**
- * Build excel the read
- *
- * @return Excel reader builder.
- */
- public static ExcelReaderBuilder read() {
- return new ExcelReaderBuilder();
- }
-
- /**
- * Build excel the read
- *
- * @param file File to read.
- * @return Excel reader builder.
- */
- public static ExcelReaderBuilder read(File file) {
- return read(file, null, null);
- }
-
- /**
- * Build excel the read
- *
- * @param file File to read.
- * @param readListener Read listener.
- * @return Excel reader builder.
- */
- public static ExcelReaderBuilder read(File file, ReadListener readListener) {
- return read(file, null, readListener);
- }
-
- /**
- * Build excel the read
- *
- * @param file File to read.
- * @param head Annotate the class for configuration information.
- * @param readListener Read listener.
- * @return Excel reader builder.
- */
- public static ExcelReaderBuilder read(File file, Class head, ReadListener readListener) {
- return new ExcelReaderBuilder().file(file).headIfNotNull(head).registerReadListenerIfNotNull(readListener);
- }
-
- /**
- * Build excel the read
- *
- * @param pathName File path to read.
- * @return Excel reader builder.
- */
- public static ExcelReaderBuilder read(String pathName) {
- return read(pathName, null, null);
- }
-
- /**
- * Build excel the read
- *
- * @param pathName File path to read.
- * @param readListener Read listener.
- * @return Excel reader builder.
- */
- public static ExcelReaderBuilder read(String pathName, ReadListener readListener) {
- return read(pathName, null, readListener);
- }
-
- /**
- * Build excel the read
- *
- * @param pathName File path to read.
- * @param head Annotate the class for configuration information.
- * @param readListener Read listener.
- * @return Excel reader builder.
- */
- public static ExcelReaderBuilder read(String pathName, Class head, ReadListener readListener) {
- return new ExcelReaderBuilder().file(pathName).headIfNotNull(head).registerReadListenerIfNotNull(readListener);
- }
-
- /**
- * Build excel the read
- *
- * @param inputStream Input stream to read.
- * @return Excel reader builder.
- */
- public static ExcelReaderBuilder read(InputStream inputStream) {
- return read(inputStream, null, null);
- }
-
- /**
- * Build excel the read
- *
- * @param inputStream Input stream to read.
- * @param readListener Read listener.
- * @return Excel reader builder.
- */
- public static ExcelReaderBuilder read(InputStream inputStream, ReadListener readListener) {
- return read(inputStream, null, readListener);
- }
-
- /**
- * Build excel the read
- *
- * @param inputStream Input stream to read.
- * @param head Annotate the class for configuration information.
- * @param readListener Read listener.
- * @return Excel reader builder.
- */
- public static ExcelReaderBuilder read(InputStream inputStream, Class head, ReadListener readListener) {
- return new ExcelReaderBuilder()
- .file(inputStream)
- .headIfNotNull(head)
- .registerReadListenerIfNotNull(readListener);
- }
-
- /**
- * Build excel the 'readSheet'
- *
- * @return Excel sheet reader builder.
- */
- public static ExcelReaderSheetBuilder readSheet() {
- return readSheet(null, null);
- }
-
- /**
- * Build excel the 'readSheet'
- *
- * @param sheetNo Index of sheet,0 base.
- * @return Excel sheet reader builder.
- */
- public static ExcelReaderSheetBuilder readSheet(Integer sheetNo) {
- return readSheet(sheetNo, null);
- }
-
- /**
- * Build excel the 'readSheet'
- *
- * @param sheetName The name of sheet.
- * @return Excel sheet reader builder.
- */
- public static ExcelReaderSheetBuilder readSheet(String sheetName) {
- return readSheet(null, sheetName);
- }
-
- /**
- * Build excel the 'readSheet'
- *
- * @param sheetNo Index of sheet,0 base.
- * @param sheetName The name of sheet.
- * @return Excel sheet reader builder.
- */
- public static ExcelReaderSheetBuilder readSheet(Integer sheetNo, String sheetName) {
- return readSheet(sheetNo, sheetName, null);
- }
-
- /**
- * Build excel the 'readSheet'
- *
- * @param sheetNo Index of sheet,0 base.
- * @param sheetName The name of sheet.
- * @param numRows The number of rows to read, the default is all, start with 0.
- * @return
- */
- public static ExcelReaderSheetBuilder readSheet(Integer sheetNo, String sheetName, Integer numRows) {
- return new ExcelReaderSheetBuilder()
- .sheetNoIfNotNull(sheetNo)
- .sheetNameIfNotNull(sheetName)
- .numRowsIfNotNull(numRows);
- }
-}
diff --git a/fesod/src/test/java/org/apache/fesod/sheet/FesodSheetFactoryTest.java b/fesod/src/test/java/org/apache/fesod/sheet/FesodSheetTest.java
similarity index 79%
rename from fesod/src/test/java/org/apache/fesod/sheet/FesodSheetFactoryTest.java
rename to fesod/src/test/java/org/apache/fesod/sheet/FesodSheetTest.java
index 4fb747554..7724fcc5f 100644
--- a/fesod/src/test/java/org/apache/fesod/sheet/FesodSheetFactoryTest.java
+++ b/fesod/src/test/java/org/apache/fesod/sheet/FesodSheetTest.java
@@ -45,8 +45,8 @@
import org.mockito.junit.jupiter.MockitoExtension;
@ExtendWith(MockitoExtension.class)
-@DisplayName("FesodSheetFactory Unit Tests")
-class FesodSheetFactoryTest {
+@DisplayName("FesodSheet Unit Tests")
+class FesodSheetTest {
@TempDir
Path tempDir;
@@ -93,13 +93,13 @@ void setUp() {
@Test
void testWrite_noArgs_shouldReturnBuilder() {
- ExcelWriterBuilder builder = FesodSheetFactory.write();
+ ExcelWriterBuilder builder = FesodSheet.write();
assertNotNull(builder);
}
@Test
void testWrite_withFile_shouldConfigureFile() {
- ExcelWriterBuilder builder = FesodSheetFactory.write(tempFile);
+ ExcelWriterBuilder builder = FesodSheet.write(tempFile);
assertNotNull(builder);
assertEquals(tempFile, writeWorkbook(builder).getFile());
@@ -107,7 +107,7 @@ void testWrite_withFile_shouldConfigureFile() {
@Test
void testWrite_withFileAndHead_shouldConfigureAll() {
- ExcelWriterBuilder builder = FesodSheetFactory.write(tempFile, DemoData.class);
+ ExcelWriterBuilder builder = FesodSheet.write(tempFile, DemoData.class);
assertNotNull(builder);
assertEquals(tempFile, writeWorkbook(builder).getFile());
assertEquals(DemoData.class, writeWorkbook(builder).getClazz());
@@ -115,14 +115,14 @@ void testWrite_withFileAndHead_shouldConfigureAll() {
@Test
void testWrite_withPathName_shouldConfigureFile() {
- ExcelWriterBuilder builder = FesodSheetFactory.write(tempFilePath);
+ ExcelWriterBuilder builder = FesodSheet.write(tempFilePath);
assertNotNull(builder);
assertEquals(tempFilePath, writeWorkbook(builder).getFile().getAbsolutePath());
}
@Test
void testWrite_withPathNameAndHead_shouldConfigureAll() {
- ExcelWriterBuilder builder = FesodSheetFactory.write(tempFilePath, DemoData.class);
+ ExcelWriterBuilder builder = FesodSheet.write(tempFilePath, DemoData.class);
assertNotNull(builder);
WriteWorkbook workbook = writeWorkbook(builder);
assertEquals(tempFilePath, workbook.getFile().getAbsolutePath());
@@ -131,14 +131,14 @@ void testWrite_withPathNameAndHead_shouldConfigureAll() {
@Test
void testWrite_withOutputStream_shouldConfigureStream() {
- ExcelWriterBuilder builder = FesodSheetFactory.write(mockOutputStream);
+ ExcelWriterBuilder builder = FesodSheet.write(mockOutputStream);
assertNotNull(builder);
assertSame(mockOutputStream, writeWorkbook(builder).getOutputStream());
}
@Test
void testWrite_withOutputStreamAndHead_shouldConfigureAll() {
- ExcelWriterBuilder builder = FesodSheetFactory.write(mockOutputStream, DemoData.class);
+ ExcelWriterBuilder builder = FesodSheet.write(mockOutputStream, DemoData.class);
assertNotNull(builder);
assertSame(mockOutputStream, writeWorkbook(builder).getOutputStream());
assertEquals(DemoData.class, writeWorkbook(builder).getClazz());
@@ -146,37 +146,37 @@ void testWrite_withOutputStreamAndHead_shouldConfigureAll() {
@Test
void testWriterSheet_noArgs_shouldReturnBuilder() {
- ExcelWriterSheetBuilder builder = FesodSheetFactory.writerSheet();
+ ExcelWriterSheetBuilder builder = FesodSheet.writerSheet();
assertNotNull(builder);
}
@Test
void testWriterSheet_withSheetNo_shouldReturnBuilder() {
- ExcelWriterSheetBuilder builder = FesodSheetFactory.writerSheet(1);
+ ExcelWriterSheetBuilder builder = FesodSheet.writerSheet(1);
assertNotNull(builder);
}
@Test
void testWriterSheet_withSheetName_shouldReturnBuilder() {
- ExcelWriterSheetBuilder builder = FesodSheetFactory.writerSheet("TestSheet");
+ ExcelWriterSheetBuilder builder = FesodSheet.writerSheet("TestSheet");
assertNotNull(builder);
}
@Test
void testWriterSheet_withSheetNoAndName_shouldReturnBuilder() {
- ExcelWriterSheetBuilder builder = FesodSheetFactory.writerSheet(1, "TestSheet");
+ ExcelWriterSheetBuilder builder = FesodSheet.writerSheet(1, "TestSheet");
assertNotNull(builder);
}
@Test
void testWriterTable_noArgs_shouldReturnBuilder() {
- ExcelWriterTableBuilder builder = FesodSheetFactory.writerTable();
+ ExcelWriterTableBuilder builder = FesodSheet.writerTable();
assertNotNull(builder);
}
@Test
void testWriterTable_withTableNo_shouldReturnBuilder() {
- ExcelWriterTableBuilder builder = FesodSheetFactory.writerTable(1);
+ ExcelWriterTableBuilder builder = FesodSheet.writerTable(1);
assertNotNull(builder);
}
@@ -184,13 +184,13 @@ void testWriterTable_withTableNo_shouldReturnBuilder() {
@Test
void testRead_noArgs_shouldReturnBuilder() {
- ExcelReaderBuilder builder = FesodSheetFactory.read();
+ ExcelReaderBuilder builder = FesodSheet.read();
assertNotNull(builder);
}
@Test
void testRead_withFile_shouldConfigureFile() throws Exception {
- ExcelReaderBuilder builder = FesodSheetFactory.read(tempFile);
+ ExcelReaderBuilder builder = FesodSheet.read(tempFile);
assertNotNull(builder);
ReadWorkbook workbook = writeWorkbook(builder);
assertEquals(tempFile, workbook.getFile());
@@ -198,7 +198,7 @@ void testRead_withFile_shouldConfigureFile() throws Exception {
@Test
void testRead_withFileAndListener_shouldConfigureAll() {
- ExcelReaderBuilder builder = FesodSheetFactory.read(tempFile, mockReadListener);
+ ExcelReaderBuilder builder = FesodSheet.read(tempFile, mockReadListener);
assertNotNull(builder);
assertEquals(tempFile, writeWorkbook(builder).getFile());
assertTrue(writeWorkbook(builder).getCustomReadListenerList().contains(mockReadListener));
@@ -206,7 +206,7 @@ void testRead_withFileAndListener_shouldConfigureAll() {
@Test
void testRead_withFileHeadAndListener_shouldConfigureAll() {
- ExcelReaderBuilder builder = FesodSheetFactory.read(tempFile, DemoData.class, mockReadListener);
+ ExcelReaderBuilder builder = FesodSheet.read(tempFile, DemoData.class, mockReadListener);
assertNotNull(builder);
assertEquals(tempFile, writeWorkbook(builder).getFile());
assertEquals(DemoData.class, writeWorkbook(builder).getClazz());
@@ -215,7 +215,7 @@ void testRead_withFileHeadAndListener_shouldConfigureAll() {
@Test
void testRead_withInputStreamHeadAndListener_shouldConfigureAll() {
- ExcelReaderBuilder builder = FesodSheetFactory.read(mockInputStream, DemoData.class, mockReadListener);
+ ExcelReaderBuilder builder = FesodSheet.read(mockInputStream, DemoData.class, mockReadListener);
assertNotNull(builder);
assertSame(mockInputStream, writeWorkbook(builder).getInputStream());
assertEquals(DemoData.class, writeWorkbook(builder).getClazz());
@@ -226,25 +226,25 @@ void testRead_withInputStreamHeadAndListener_shouldConfigureAll() {
@Test
void testReadSheet_noArgs_shouldReturnBuilder() {
- ExcelReaderSheetBuilder builder = FesodSheetFactory.readSheet();
+ ExcelReaderSheetBuilder builder = FesodSheet.readSheet();
assertNotNull(builder);
}
@Test
void testReadSheet_withSheetNo_shouldReturnBuilder() {
- ExcelReaderSheetBuilder builder = FesodSheetFactory.readSheet(0);
+ ExcelReaderSheetBuilder builder = FesodSheet.readSheet(0);
assertNotNull(builder);
}
@Test
void testReadSheet_withSheetName_shouldReturnBuilder() {
- ExcelReaderSheetBuilder builder = FesodSheetFactory.readSheet("DataSheet");
+ ExcelReaderSheetBuilder builder = FesodSheet.readSheet("DataSheet");
assertNotNull(builder);
}
@Test
void testReadSheet_withAllParams_shouldReturnBuilder() {
- ExcelReaderSheetBuilder builder = FesodSheetFactory.readSheet(0, "DataSheet", 100);
+ ExcelReaderSheetBuilder builder = FesodSheet.readSheet(0, "DataSheet", 100);
assertNotNull(builder);
}
}
diff --git a/fesod/src/test/java/org/apache/fesod/sheet/csv/CsvBenignErrorToleranceTest.java b/fesod/src/test/java/org/apache/fesod/sheet/csv/CsvBenignErrorToleranceTest.java
index 885011eb9..012379fdc 100644
--- a/fesod/src/test/java/org/apache/fesod/sheet/csv/CsvBenignErrorToleranceTest.java
+++ b/fesod/src/test/java/org/apache/fesod/sheet/csv/CsvBenignErrorToleranceTest.java
@@ -26,7 +26,7 @@
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.List;
-import org.apache.fesod.sheet.FesodSheetFactory;
+import org.apache.fesod.sheet.FesodSheet;
import org.apache.fesod.sheet.exception.ExcelCommonException;
import org.apache.fesod.sheet.read.builder.CsvReaderBuilder;
import org.junit.jupiter.api.Test;
@@ -45,7 +45,7 @@ void shouldNotThrowOnUnclosedQuotedField_EOFBenign() {
// When / Then: reading should complete without throwing any exception
assertDoesNotThrow(() -> {
- CsvReaderBuilder builder = FesodSheetFactory.read(in).csv();
+ CsvReaderBuilder builder = FesodSheet.read(in).csv();
// Use sync read to drive the pipeline end-to-end
List