Fix empty fow handling in Excel reader

CI-CMG · Aug 23, 2024 · fa669c3 · fa669c3
1 parent eff4e78
commit fa669c3
Showing 1 changed file with 19 additions and 22 deletions.
diff --git a/pace-translator/src/main/java/edu/colorado/cires/pace/translator/ExcelReader.java b/pace-translator/src/main/java/edu/colorado/cires/pace/translator/ExcelReader.java
@@ -25,13 +25,8 @@ public static Stream<MapWithRowNumber> read(InputStream inputStream, int sheetIn
                   .toList();
 
               rows.remove(0);
-              return rows.stream().map(row -> {
-                try {
-                  return rowToPropertyMap(row, headers);
-                } catch (TranslationException e) {
-                  throw new RuntimeException(e);
-                }
-              });
+              return rows.stream()
+                  .map(row -> rowToPropertyMap(row, headers));
             } catch (IOException e) {
               throw new RuntimeException(e);
             }
@@ -40,22 +35,24 @@ public static Stream<MapWithRowNumber> read(InputStream inputStream, int sheetIn
     }
   }
 
-  private static MapWithRowNumber rowToPropertyMap(Row row, List<String> headers) throws TranslationException {
-    try {
-      return new MapWithRowNumber(
-          IntStream.range(0, headers.size()).boxed().collect(Collectors.toMap(
-              headers::get,
-              i -> new ValueWithColumnNumber(
-                  Optional.ofNullable(row.getCell(i))
-                      .map(Cell::getRawValue),
+  private static MapWithRowNumber rowToPropertyMap(Row row, List<String> headers) {
+    return new MapWithRowNumber(
+        IntStream.range(0, headers.size()).boxed().collect(Collectors.toMap(
+            headers::get,
+            i -> {
+              Optional<String> value = Optional.empty();
+              if (row.getCellCount() >= i + 1) {
+                value = Optional.ofNullable(row.getCell(i))
+                    .map(Cell::getText);
+              }
+              return new ValueWithColumnNumber(
+                  value,
                   i
-              )
-          )),
-          row.getRowNum()
-      );
-    } catch (Exception e) {
-      throw new TranslationException("Invalid rows in excel sheet");
-    }
+              );
+            }
+        )),
+        row.getRowNum()
+    );
   }
 
 }