Removed static methods that create an ExcelSheet

Author: MBenincasa

src/main/java/model/ExcelSheet.java

@@ -1,13 +1,11 @@
 package model;
 
-import exceptions.SheetAlreadyExistsException;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -37,36 +35,6 @@ public class ExcelSheet {
      */
     private String name;
 
-    /**
-     * Create a new Sheet
-     * @param excelWorkbook The Workbook where to create the Sheet
-     * @return A ExcelSheet
-     * @throws SheetAlreadyExistsException If a Sheet with that name already exists
-     */
-    public static ExcelSheet create(ExcelWorkbook excelWorkbook) throws SheetAlreadyExistsException {
-        return create(excelWorkbook, null);
-    }
-
-    /**
-     * Create a new Sheet
-     * @param excelWorkbook The Workbook where to create the Sheet
-     * @param sheetName The name of the sheet
-     * @return A ExcelSheet
-     * @throws SheetAlreadyExistsException If a Sheet with that name already exists
-     */
-    public static ExcelSheet create(ExcelWorkbook excelWorkbook, String sheetName) throws SheetAlreadyExistsException {
-        Workbook workbook = excelWorkbook.getWorkbook();
-        Sheet sheet;
-        try {
-            sheet = (sheetName == null || sheetName.isEmpty())
-                    ? workbook.createSheet()
-                    : workbook.createSheet(sheetName);
-        } catch (IllegalArgumentException e) {
-            throw new SheetAlreadyExistsException(e.getMessage(), e.getCause());
-        }
-        return new ExcelSheet(sheet, workbook.getSheetIndex(sheet), sheet.getSheetName());
-    }
-
     /**
      * Returns the Workbook to which it belongs
      * @return A ExcelWorkbook

src/main/java/model/ExcelWorkbook.java

@@ -218,6 +218,15 @@ public List<ExcelSheet> getSheets() {
         return excelSheets;
     }
 
+    /**
+     * Create a new Sheet inside the Workbook
+     * @return The newly created Sheet
+     */
+    public ExcelSheet createSheet() {
+        Sheet sheet = this.workbook.createSheet();
+        return new ExcelSheet(sheet, this.workbook.getSheetIndex(sheet), sheet.getSheetName());
+    }
+
     /**
      * Create a new Sheet inside the Workbook
      * @param sheetName The name of the sheet to create
@@ -279,7 +288,7 @@ public ExcelSheet getSheetOrCreate(String sheetName) {
         try {
             return this.getSheet(sheetName);
         } catch (SheetNotFoundException e) {
-            return ExcelSheet.create(this, sheetName);
+            return this.createSheet(sheetName);
         }
     }
 

src/main/java/samples/writeExcelSample/Main.java

@@ -19,7 +19,7 @@ public static void main(String[] args) {
 
         try {
             ExcelWorkbook excelWorkbook = ExcelWorkbook.create(FilenameUtils.getExtension(testFile.getName()));
-            ExcelSheet excelSheet = ExcelSheet.create(excelWorkbook);
+            ExcelSheet excelSheet = excelWorkbook.createSheet("TEST");
             ExcelRow excelRow = excelSheet.createRow(0);
             ExcelCell excelCell = excelRow.createCell(0);
             excelCell.writeValue("Rossi");

src/main/java/tools/Converter.java

@@ -141,7 +141,9 @@ public static Sheet create(File file, String sheetName) throws ExtensionNotValid
         /* Open file excel */
         FileInputStream fileInputStream = new FileInputStream(file);
         ExcelWorkbook excelWorkbook = ExcelWorkbook.open(fileInputStream, extension);
-        ExcelSheet excelSheet = ExcelSheet.create(excelWorkbook, sheetName);
+        ExcelSheet excelSheet = (sheetName == null || sheetName.isEmpty())
+                ? excelWorkbook.createSheet()
+                : excelWorkbook.createSheet(sheetName);
 
         return excelSheet.getSheet();
     }
@@ -165,7 +167,9 @@ public static Sheet create(Workbook workbook) throws SheetAlreadyExistsException
      */
     public static Sheet create(Workbook workbook, String sheetName) throws SheetAlreadyExistsException {
         ExcelWorkbook excelWorkbook = new ExcelWorkbook(workbook);
-        ExcelSheet excelSheet = ExcelSheet.create(excelWorkbook, sheetName);
+        ExcelSheet excelSheet = (sheetName == null || sheetName.isEmpty())
+                ? excelWorkbook.createSheet()
+                : excelWorkbook.createSheet(sheetName);
         return excelSheet.getSheet();
     }
 

src/main/java/tools/SheetUtility.java

@@ -2,7 +2,6 @@
 
 import exceptions.ExtensionNotValidException;
 import exceptions.OpenWorkbookException;
-import exceptions.SheetAlreadyExistsException;
 import exceptions.SheetNotFoundException;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -15,22 +14,6 @@ public class ExcelSheetTest {
 
     private final File excelFile = new File("./src/test/resources/employee.xlsx");
 
-    @Test
-    void create() throws OpenWorkbookException, ExtensionNotValidException, IOException, SheetAlreadyExistsException {
-        ExcelWorkbook excelWorkbook = ExcelWorkbook.open(excelFile);
-        ExcelSheet excelSheet = ExcelSheet.create(excelWorkbook);
-        Assertions.assertNotNull(excelSheet.getSheet());
-    }
-
-    @Test
-    void testCreate() throws OpenWorkbookException, ExtensionNotValidException, IOException, SheetAlreadyExistsException {
-        ExcelWorkbook excelWorkbook = ExcelWorkbook.open(excelFile);
-        String sheetName = "Admin";
-        ExcelSheet excelSheet = ExcelSheet.create(excelWorkbook, sheetName);
-        Assertions.assertNotNull(excelSheet.getSheet());
-        Assertions.assertEquals(true, excelWorkbook.isSheetPresent(sheetName));
-    }
-
     @Test
     void getWorkbook() throws OpenWorkbookException, ExtensionNotValidException, IOException, SheetNotFoundException {
         ExcelWorkbook excelWorkbook = ExcelWorkbook.open(excelFile);

src/test/java/model/ExcelSheetTest.java

@@ -115,6 +115,13 @@ void createSheet() throws OpenWorkbookException, ExtensionNotValidException, IOE
         Assertions.assertEquals("Test", excelSheet.getName());
     }
 
+    @Test
+    void testCreateSheet() throws OpenWorkbookException, ExtensionNotValidException, IOException {
+        ExcelWorkbook excelWorkbook = ExcelWorkbook.open(excelFile);
+        ExcelSheet excelSheet = excelWorkbook.createSheet();
+        Assertions.assertNotNull(excelSheet.getSheet());
+    }
+
     @Test
     void getSheets() throws OpenWorkbookException, ExtensionNotValidException, IOException {
         ExcelWorkbook excelWorkbook = ExcelWorkbook.open(excelFile);