fix: SheetWrapper.getCellAsInteger(): Added STRING

project-tsurugi · Nov 30, 2023 · 80a8e39 · 80a8e39
1 parent 74c3692
commit 80a8e39
Showing 1 changed file with 23 additions and 3 deletions.
diff --git a/...mark/src/main/java/com/tsurugidb/benchmark/costaccounting/generate/util/SheetWrapper.java b/...mark/src/main/java/com/tsurugidb/benchmark/costaccounting/generate/util/SheetWrapper.java
@@ -106,7 +106,7 @@ public String getCellAsString(Row row, int colIndex) {
         case BLANK:
             return null;
         default:
-            throw new UnsupportedOperationException(cell.getCellType().name());
+            throw new UnsupportedOperationException(String.format("(row=%d, col=%d) %s", row.getRowNum(), colIndex, cell.getCellType().name()));
         }
     }
 
@@ -119,10 +119,20 @@ public Integer getCellAsInteger(Row row, int colIndex) {
         case NUMERIC:
         case FORMULA:
             return (int) cell.getNumericCellValue();
+        case STRING:
+            String s = cell.getStringCellValue();
+            if (s.trim().isEmpty()) {
+                return null;
+            }
+            try {
+                return Integer.valueOf(s);
+            } catch (Exception e) {
+                throw new IllegalStateException(String.format("(row=%d, col=%d) %s", row.getRowNum(), colIndex, cell.getCellType().name()), e);
+            }
         case BLANK:
             return null;
         default:
-            throw new UnsupportedOperationException(cell.getCellType().name());
+            throw new UnsupportedOperationException(String.format("(row=%d, col=%d) %s", row.getRowNum(), colIndex, cell.getCellType().name()));
         }
     }
 
@@ -135,10 +145,20 @@ public BigDecimal getCellAsDecimal(Row row, int colIndex) {
         case NUMERIC:
         case FORMULA:
             return BigDecimal.valueOf(cell.getNumericCellValue());
+        case STRING:
+            String s = cell.getStringCellValue();
+            if (s.trim().isEmpty()) {
+                return null;
+            }
+            try {
+                return new BigDecimal(s);
+            } catch (Exception e) {
+                throw new IllegalStateException(String.format("(row=%d, col=%d) %s", row.getRowNum(), colIndex, cell.getCellType().name()), e);
+            }
         case BLANK:
             return null;
         default:
-            throw new UnsupportedOperationException(cell.getCellType().name());
+            throw new UnsupportedOperationException(String.format("(row=%d, col=%d) %s", row.getRowNum(), colIndex, cell.getCellType().name()));
         }
     }
 }