added support for optional diff excel generation

Author: abhisheksarkar30

apps/excel-diff-checker.jar

@@ -15,13 +15,15 @@
  *
  */
 public class ExcelDiffChecker {
-
+
 static boolean diffFound = false;
+static boolean commentFlag = true;
 
 public static void main(String[] args) {
 
 String FILE_NAME1 = args[0];
 String FILE_NAME2 = args[1];
+commentFlag = args.length == 2;
 
 String RESULT_FILE = FILE_NAME1.substring(0, FILE_NAME1.lastIndexOf(".")) + " vs " +
 FILE_NAME2;
@@ -60,7 +62,7 @@ public static void main(String[] args) {
 for(int rowIndex = 0; rowIndex <= sheet1.getLastRowNum(); rowIndex++) {
 XSSFRow row1 = (XSSFRow) sheet1.getRow(rowIndex);
 XSSFRow row2 = (XSSFRow) sheet2.getRow(rowIndex);
-
+
 if(row1 == null || row2 == null) {
 if(row1 != row2) 
 System.out.println("Both rows are not null at rowIndex = " + rowIndex);
@@ -80,44 +82,37 @@ public static void main(String[] args) {
 if(Utility.hasContent(cell2)) {
 if(cell1 == null)
 cell1 = row1.createCell(columnIndex);
-System.out.println(String.format("Diff at cell[%s] of sheet[%s]", 
-cell1.getReference(), sheet1.getSheetName()));
-
+
 Utility.addComment(resultWorkbook, sheet1, rowIndex, cell1, "SYSTEM", cell2);
 }
 } else if(Utility.hasNoContent(cell2)) {
 if(Utility.hasContent(cell1)) {
-System.out.println(String.format("Diff at cell[%s] of sheet[%s]", 
-cell1.getReference(), sheet1.getSheetName()));
-
 Utility.addComment(resultWorkbook, sheet1, rowIndex, cell1, "SYSTEM", null);
 }
 } else if(!cell1.getRawValue().equals(cell2.getRawValue())) {
-System.out.println(String.format("Diff at cell[%s] of sheet[%s]", 
-cell1.getReference(), sheet1.getSheetName()));
-
 Utility.addComment(resultWorkbook, sheet1, rowIndex, cell1, "SYSTEM", cell2);
 }
 }
 }
 }
- 
- try (FileOutputStream outputStream = new FileOutputStream(RESULT_FILE)) {
- resultWorkbook.write(outputStream);
- }
+
+if(success) {
+if(diffFound) {
+if(commentFlag) {
+try (FileOutputStream outputStream = new FileOutputStream(RESULT_FILE)) {
+resultWorkbook.write(outputStream);
+System.out.println("Diff excel has been generated!");
+}
+}
+} else 
+System.out.println("No diff found!");
+}
 } catch (Exception e) {
 e.printStackTrace(System.out);
-success = false;
-} finally {
-if(success && diffFound)
-System.out.println("Diff excel has been generated!");
-else {
-if(success)
-System.out.println("No diff found!");
+
+if(resultFile.exists())
 resultFile.delete();
-}
 }
-
 }
-
+
 }

src/main/java/edu/abhi/poi/excel/ExcelDiffChecker.java

@@ -3,7 +3,6 @@
  */
 package edu.abhi.poi.excel;
 
-import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.ss.usermodel.ClientAnchor;
 import org.apache.poi.ss.usermodel.Comment;
@@ -29,7 +28,17 @@ public static boolean hasContent(XSSFCell cell) {
 }
 
 @SuppressWarnings("rawtypes")
-public static void addComment(Workbook workbook, Sheet sheet, int rowIndex, Cell cell1, String author, XSSFCell cell2) throws Exception {
+public static void addComment(Workbook workbook, Sheet sheet, int rowIndex, XSSFCell cell1, String author, XSSFCell cell2) throws Exception {
+
+System.out.println(String.format("Diff at cell[%s] of sheet[%s]", cell1.getReference(), sheet.getSheetName()));
+
+ExcelDiffChecker.diffFound = true;
+
+if(!ExcelDiffChecker.commentFlag) {
+System.out.println(String.format("Expected: [%s], Found: [%s]", getCellValue(cell1), getCellValue(cell2)));
+return;
+}
+
 CreationHelper factory = workbook.getCreationHelper();
  //get an existing cell or create it otherwise:
 
@@ -48,8 +57,6 @@ public static void addComment(Workbook workbook, Sheet sheet, int rowIndex, Cell
  comment.setAuthor(author);
 
  cell1.setCellComment(comment);
- 
- ExcelDiffChecker.diffFound = true;
 }
 
 public static String getCellValue(XSSFCell cell) throws Exception {