I added some methods for ExcelRow and ExcelCell. I added equals and hashcode methods

Author: MBenincasa

src/main/java/model/ExcelCell.java

@@ -1,10 +1,21 @@
 package model;
 
 import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
 import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
 
 @AllArgsConstructor
+@Getter
+@EqualsAndHashCode
 public class ExcelCell {
 
     private Cell cell;
+    private Integer index;
+
+    public ExcelRow getRow() {
+        Row row = this.cell.getRow();
+        return new ExcelRow(row, row.getRowNum());
+    }
 }

src/main/java/model/ExcelRow.java

@@ -1,10 +1,38 @@
 package model;
 
 import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.SneakyThrows;
+import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+
+import java.util.LinkedList;
+import java.util.List;
 
 @AllArgsConstructor
+@Getter
+@EqualsAndHashCode
 public class ExcelRow {
 
     private Row row;
+    private Integer index;
+
+    public List<ExcelCell> getCells() {
+        List<ExcelCell> excelCells = new LinkedList<>();
+        for (Cell cell : this.row) {
+            excelCells.add(new ExcelCell(cell, cell.getColumnIndex()));
+        }
+
+        return excelCells;
+    }
+
+    @SneakyThrows
+    public ExcelSheet getSheet() {
+        Sheet sheet = this.row.getSheet();
+        ExcelWorkbook excelWorkbook = new ExcelWorkbook(sheet.getWorkbook());
+        String sheetName = sheet.getSheetName();
+        return new ExcelSheet(sheet, excelWorkbook.getSheet(sheetName).getIndex(), sheetName);
+    }
 }

src/main/java/model/ExcelSheet.java

@@ -2,12 +2,18 @@
 
 import exceptions.SheetAlreadyExistsException;
 import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
+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;
+
 @AllArgsConstructor
 @Getter
+@EqualsAndHashCode
 public class ExcelSheet {
 
     private Sheet sheet;
@@ -31,7 +37,16 @@ public static ExcelSheet create(ExcelWorkbook excelWorkbook, String sheetName) t
         return new ExcelSheet(sheet, workbook.getSheetIndex(sheet), sheet.getSheetName());
     }
 
-    public ExcelWorkbook getExcelWorkbook() {
+    public ExcelWorkbook getWorkbook() {
         return new ExcelWorkbook(this.getSheet().getWorkbook());
     }
+
+    public List<ExcelRow> getRows() {
+        List<ExcelRow> excelRows = new LinkedList<>();
+        for (Row row : this.sheet) {
+            excelRows.add(new ExcelRow(row, row.getRowNum()));
+        }
+        
+        return excelRows;
+    }
 }

src/main/java/model/ExcelWorkbook.java

@@ -7,6 +7,7 @@
 import exceptions.OpenWorkbookException;
 import exceptions.SheetNotFoundException;
 import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.SneakyThrows;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -25,6 +26,7 @@
 
 @AllArgsConstructor
 @Getter
+@EqualsAndHashCode
 public class ExcelWorkbook {
 
     private Workbook workbook;
@@ -128,6 +130,10 @@ public List<ExcelSheet> getSheets() {
         return excelSheets;
     }
 
+    public ExcelSheet getSheet() throws SheetNotFoundException {
+        return this.getSheet(0);
+    }
+
     public ExcelSheet getSheet(Integer index) throws SheetNotFoundException {
         List<ExcelSheet> excelSheets = this.getSheets();
         for (ExcelSheet excelSheet : excelSheets) {

src/test/java/model/ExcelCellTest.java

@@ -0,0 +1,25 @@
+package model;
+
+import exceptions.ExtensionNotValidException;
+import exceptions.OpenWorkbookException;
+import exceptions.SheetNotFoundException;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+import java.io.IOException;
+
+class ExcelCellTest {
+
+    private final File excelFile = new File("./src/test/resources/employee.xlsx");
+
+    @Test
+    void getRow() throws OpenWorkbookException, ExtensionNotValidException, IOException, SheetNotFoundException {
+        ExcelWorkbook excelWorkbook = ExcelWorkbook.open(excelFile);
+        ExcelSheet excelSheet = excelWorkbook.getSheet();
+        ExcelRow excelRow = excelSheet.getRows().get(0);
+        ExcelCell excelCell = excelRow.getCells().get(0);
+        ExcelRow excelRow1 = excelCell.getRow();
+        Assertions.assertEquals(excelRow, excelRow1);
+    }
+}

src/test/java/model/ExcelRowTest.java

@@ -0,0 +1,37 @@
+package model;
+
+import exceptions.ExtensionNotValidException;
+import exceptions.OpenWorkbookException;
+import exceptions.SheetNotFoundException;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+
+class ExcelRowTest {
+
+    private final File excelFile = new File("./src/test/resources/employee.xlsx");
+
+    @Test
+    void getCells() throws OpenWorkbookException, ExtensionNotValidException, IOException, SheetNotFoundException {
+        ExcelWorkbook excelWorkbook = ExcelWorkbook.open(excelFile);
+        ExcelSheet excelSheet = excelWorkbook.getSheet("Office");
+        ExcelRow excelRow = excelSheet.getRows().get(0);
+        List<ExcelCell> excelCells = excelRow.getCells();
+        Assertions.assertEquals("CITY", excelCells.get(0).getCell().getStringCellValue());
+        Assertions.assertEquals("PROVINCE", excelCells.get(1).getCell().getStringCellValue());
+        Assertions.assertEquals("NUMBER OF STATIONS", excelCells.get(2).getCell().getStringCellValue());
+
+    }
+
+    @Test
+    void getSheet() throws OpenWorkbookException, ExtensionNotValidException, IOException, SheetNotFoundException {
+        ExcelWorkbook excelWorkbook = ExcelWorkbook.open(excelFile);
+        ExcelSheet excelSheet = excelWorkbook.getSheet();
+        ExcelRow excelRow = excelSheet.getRows().get(0);
+        ExcelSheet excelSheet1 = excelRow.getSheet();
+        Assertions.assertEquals(excelSheet, excelSheet1);
+    }
+}

src/test/java/model/ExcelSheetTest.java

@@ -31,10 +31,14 @@ void testCreate() throws OpenWorkbookException, ExtensionNotValidException, IOEx
     }
 
     @Test
-    void getExcelWorkbook() throws OpenWorkbookException, ExtensionNotValidException, IOException, SheetNotFoundException {
+    void getWorkbook() throws OpenWorkbookException, ExtensionNotValidException, IOException, SheetNotFoundException {
         ExcelWorkbook excelWorkbook = ExcelWorkbook.open(excelFile);
         ExcelSheet excelSheet = excelWorkbook.getSheet(0);
-        ExcelWorkbook excelWorkbook1 = excelSheet.getExcelWorkbook();
+        ExcelWorkbook excelWorkbook1 = excelSheet.getWorkbook();
         Assertions.assertNotNull(excelWorkbook1.getWorkbook());
     }
+
+    @Test
+    void getRows() {
+    }
 }

src/test/java/model/ExcelWorkbookTest.java

@@ -127,6 +127,12 @@ void testGetSheet() throws OpenWorkbookException, ExtensionNotValidException, IO
         Assertions.assertEquals("Employee", excelWorkbook.getSheet("Employee").getName());
     }
 
+    @Test
+    void testGetSheet1() throws OpenWorkbookException, ExtensionNotValidException, IOException, SheetNotFoundException {
+        ExcelWorkbook excelWorkbook = ExcelWorkbook.open(excelFile);
+        Assertions.assertEquals("Employee", excelWorkbook.getSheet().getName());
+    }
+
     @Test
     void getSheetOrCreate() throws OpenWorkbookException, ExtensionNotValidException, IOException {
         ExcelWorkbook excelWorkbook = ExcelWorkbook.open(excelFile);
@@ -156,5 +162,4 @@ void testIsSheetNull() throws OpenWorkbookException, ExtensionNotValidException,
         ExcelWorkbook excelWorkbook = ExcelWorkbook.open(excelFile);
         Assertions.assertEquals(true, excelWorkbook.isSheetNull(3));
     }
-
 }