Update v2.4.2

rabanti-github · Oct 26, 2024 · 35924e7 · 35924e7
1 parent 30f307c
commit 35924e7
Show file tree

Hide file tree

Showing 7 changed files with 82 additions and 30 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,13 @@
 # Change Log
 
+## v2.4.2
+
+---
+Release Date: **26.10.2024**
+
+- Fixed a bug regarding the determination of the first data cell in an empty worksheet. Bug fix provided by Martin Stránský for NanoXLSX (.NET)
+- Updated Javadoc
+
 ## v2.4.1
 
 ---

diff --git a/NanoXLSX4j.Demo/pom.xml b/NanoXLSX4j.Demo/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>nanoxlsx4j-root</artifactId>
         <groupId>ch.rabanti</groupId>
-        <version>2.4.1</version> <!-- Maintained in lib -->
+        <version>2.4.2</version> <!-- Maintained in lib -->
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/NanoXLSX4j.Lib/pom.xml b/NanoXLSX4j.Lib/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>ch.rabanti</groupId>
     <artifactId>nanoxlsx4j</artifactId>
-    <version>2.4.1</version> <!-- Maintain also in demo and root project -->
+    <version>2.4.2</version> <!-- Maintain also in demo and root project -->
     <packaging>jar</packaging>
 
     <properties>

diff --git a/NanoXLSX4j.Lib/src/main/java/ch/rabanti/nanoxlsx4j/Worksheet.java b/NanoXLSX4j.Lib/src/main/java/ch/rabanti/nanoxlsx4j/Worksheet.java
@@ -930,8 +930,9 @@ public Worksheet(String name, int id, Workbook reference) {
     /**
      * Adds an object to the next cell position. If the type of the value does not match with one of the supported data
      * types, it will be cast to a String. A prepared object of the type Cell will not be cast but adjusted<br>
-     * Recognized are the following data types: Cell (prepared object), String, int, double, float, long, Date, boolean.
-     * All other types will be cast into a String using the default toString() method
+     * Recognized are the following data types: Cell (prepared object), String, short, int, byte, double, float,
+     * boolean, long, BigDecimal, Date, Time, LocalTime. All other types will be cast into a String using the default
+     * toString() method
      *
      * @param value Unspecified value to insert
      * @throws RangeException Thrown if the next cell is out of range (on row or column)
@@ -943,8 +944,9 @@ public void addNextCell(Object value) {
     /**
      * Adds an object to the next cell position. If the type of the value does not match with one of the supported data
      * types, it will be cast to a String.A prepared object of the type Cell will not be cast but adjusted<br>
-     * Recognized are the following data types: Cell (prepared object), String, int, double, float, long, Date, boolean.
-     * All other types will be cast into a String using the default toString() method
+     * Recognized are the following data types: Cell (prepared object), String, short, int, byte, double, float,
+     * boolean, long, BigDecimal, Date, Time, LocalTime. All other types will be cast into a String using the default
+     * toString() method
      *
      * @param value Unspecified value to insert
      * @param style Style object to apply on this cell
@@ -1016,8 +1018,9 @@ else if (this.getCurrentCellDirection() == CellDirection.RowToRow) {
     /**
      * Adds an object to the defined cell address. If the type of the value does not match with one of the supported
      * data types, it will be cast to a String. A prepared object of the type Cell will not be cast but adjusted<br>
-     * Recognized are the following data types: Cell (prepared object), String, int, double, float, long, Date, boolean.
-     * All other types will be cast into a String using the default toString() method
+     * Recognized are the following data types: Cell (prepared object), String, short, int, byte, double, float,
+     * boolean, long, BigDecimal, Date, Time, LocalTime. All other types will be cast into a String using the default
+     * toString() method
      *
      * @param value        Unspecified value to insert
      * @param columnNumber Column number (zero based)
@@ -1032,8 +1035,9 @@ public void addCell(Object value, int columnNumber, int rowNumber) {
     /**
      * Adds an object to the defined cell address. If the type of the value does not match with one of the supported
      * data types, it will be cast to a String. A prepared object of the type Cell will not be cast but adjusted<br>
-     * Recognized are the following data types: Cell (prepared object), String, int, double, float, long, Date, boolean.
-     * All other types will be cast into a String using the default toString() method
+     * Recognized are the following data types: Cell (prepared object), String, short, int, byte, double, float,
+     * boolean, long, BigDecimal, Date, Time, LocalTime. All other types will be cast into a String using the default
+     * toString() method
      *
      * @param value        Unspecified value to insert
      * @param columnNumber Column number (zero based)
@@ -1050,8 +1054,9 @@ public void addCell(Object value, int columnNumber, int rowNumber, Style style)
     /**
      * Adds an object to the defined cell address. If the type of the value does not match with one of the supported
      * data types, it will be cast to a String. A prepared object of the type Cell will not be cast but adjusted<br>
-     * Recognized are the following data types: Cell (prepared object), String, int, double, float, long, Date, boolean.
-     * All other types will be cast into a String using the default toString() method
+     * Recognized are the following data types: Cell (prepared object), String, short, int, byte, double, float,
+     * boolean, long, BigDecimal, Date, Time, LocalTime. All other types will be cast into a String using the default
+     * toString() method
      *
      * @param value   Unspecified value to insert
      * @param address Cell address in the format A1 - XFD1048576
@@ -1067,8 +1072,9 @@ public void addCell(Object value, String address) {
     /**
      * Adds an object to the defined cell address. If the type of the value does not match with one of the supported
      * data types, it will be cast to a String. A prepared object of the type Cell will not be cast but adjusted<br>
-     * Recognized are the following data types: Cell (prepared object), String, int, double, float, long, Date, boolean.
-     * All other types will be cast into a String using the default toString() method
+     * Recognized are the following data types: Cell (prepared object), String, short, int, byte, double, float,
+     * boolean, long, BigDecimal, Date, Time, LocalTime. All other types will be cast into a String using the default
+     * toString() method
      *
      * @param value   Unspecified value to insert
      * @param address Cell address in the format A1 - XFD1048576
@@ -1174,8 +1180,9 @@ public void addNextCellFormula(String formula, Style style) {
     /**
      * Adds a list of object values to a defined cell range. If the type of the particular value does not match with one
      * of the supported data types, it will be cast to a String. A prepared object of the type Cell will not be cast but
-     * adjusted<br> Recognized are the following data types: Cell (prepared object), String, int, double, float, long,
-     * Date, boolean. All other types will be cast into a String using the default toString() method
+     * Recognized are the following data types: Cell (prepared object), String, short, int, byte, double, float,
+     * boolean, long, BigDecimal, Date, Time, LocalTime. All other types will be cast into a String using the default
+     * toString() method
      *
      * @param values       List of unspecified objects to insert
      * @param startAddress Start address
@@ -1190,8 +1197,9 @@ public void addCellRange(List<Object> values, Address startAddress, Address endA
     /**
      * Adds a list of object values to a defined cell range. If the type of the particular value does not match with one
      * of the supported data types, it will be cast to a String. A prepared object of the type Cell will not be cast but
-     * adjusted<br> Recognized are the following data types: Cell (prepared object), String, int, double, float, long,
-     * Date, boolean. All other types will be cast into a String using the default toString() method
+     * Recognized are the following data types: Cell (prepared object), String, short, int, byte, double, float,
+     * boolean, long, BigDecimal, Date, Time, LocalTime. All other types will be cast into a String using the default
+     * toString() method
      *
      * @param values       List of unspecified objects to insert
      * @param startAddress Start address
@@ -1208,8 +1216,8 @@ public void addCellRange(List<Object> values, Address startAddress, Address endA
      * Adds a list of object values to a defined cell range. If the type of the particular value does not match with one
      * of the supported data types, it will be cast to a String. A prepared object of the type Cell will not be cast but
      * adjusted<br> The data types in the passed list can be mixed. Recognized are the following data types: Cell
-     * (prepared object), String, int, double, float, long, Date, boolean. All other types will be cast into a String
-     * using the default toString() method
+     * (prepared object), String, short, int, byte, double, float, boolean, long, BigDecimal, Date, Time, LocalTime. All
+     * other types will be cast into a String using the default toString() method
      *
      * @param values    List of unspecified objects to insert
      * @param cellRange Cell range as string in the format like A1:D1 or X10:X22
@@ -1226,8 +1234,8 @@ public void addCellRange(List<Object> values, String cellRange) {
      * Adds a list of object values to a defined cell range. If the type of the particular value does not match with one
      * of the supported data types, it will be cast to a String. A prepared object of the type Cell will not be cast but
      * adjusted<br> The data types in the passed list can be mixed. Recognized are the following data types: Cell
-     * (prepared object), String, int, double, float, long, Date, boolean. All other types will be cast into a String
-     * using the default toString() method
+     *      * (prepared object), String, short, int, byte, double, float, boolean, long, BigDecimal, Date, Time, LocalTime. All
+     *      * other types will be cast into a String using the default toString() method
      *
      * @param values    List of unspecified objects to insert
      * @param cellRange Cell range as string in the format like A1:D1 or X10:X22
@@ -1749,23 +1757,21 @@ else if (min) {
                 return cells.values().stream().max(Comparator.comparingInt(Cell::getColumnNumber)).get().getColumnNumber();
             }
         }
-        List<Cell> nonEmptyCells = cells.values().stream().filter(x -> x.getValue() != null).collect(Collectors.toList());
+        List<Cell> nonEmptyCells = cells.values().stream().filter(x -> x.getValue() != null && !x.getValue().toString().isEmpty()).collect(Collectors.toList());
         if (nonEmptyCells.isEmpty()) {
             return -1;
         }
         if (row && min) {
-            return nonEmptyCells.stream().filter(x -> x.getValue().toString() != "").min(Comparator.comparingInt(Cell::getRowNumber)).get().getRowNumber();
+            return nonEmptyCells.stream().min(Comparator.comparingInt(Cell::getRowNumber)).get().getRowNumber();
         }
         else if (row) {
-            return nonEmptyCells.stream().filter(x -> x.getValue().toString() != "").max(Comparator.comparingInt(Cell::getRowNumber)).get().getRowNumber();
+            return nonEmptyCells.stream().max(Comparator.comparingInt(Cell::getRowNumber)).get().getRowNumber();
         }
         else if (min) {
-            return nonEmptyCells.stream().filter(x -> x.getValue().toString() != "").min(Comparator.comparingInt(Cell::getColumnNumber)).get()
-                    .getColumnNumber();
+            return nonEmptyCells.stream().min(Comparator.comparingInt(Cell::getColumnNumber)).get().getColumnNumber();
         }
         else {
-            return nonEmptyCells.stream().filter(x -> x.getValue().toString() != "").max(Comparator.comparingInt(Cell::getColumnNumber)).get()
-                    .getColumnNumber();
+            return nonEmptyCells.stream().max(Comparator.comparingInt(Cell::getColumnNumber)).get().getColumnNumber();
         }
     }
 

diff --git a/NanoXLSX4j.Lib/src/test/java/ch/rabanti/nanoxlsx4j/worksheets/GetColumBoundariesTest.java b/NanoXLSX4j.Lib/src/test/java/ch/rabanti/nanoxlsx4j/worksheets/GetColumBoundariesTest.java
@@ -315,4 +315,23 @@ void getFirstOrLastDataColumnNumberTest2() {
         assertEquals(5, maxColumn);
     }
 
+    @DisplayName("Test of the getFirstDataRowNumber and getLastDataRowNumber functions with an explicitly defined, cell with empty string besides other row definitions")
+    @ParameterizedTest(name = "Given empty cell address {0} should lead to -1 as  first and last column")
+    @CsvSource(
+            {
+                    "'F5'",
+                    "'A1'"}
+    )
+    void getFirstOrLastDataRowNumberTest3(String emptyCellAddress)
+    {
+        Worksheet worksheet = new Worksheet();
+        worksheet.addHiddenRow(3);
+        worksheet.addHiddenRow(4);
+        worksheet.addCell("", emptyCellAddress);
+        int minRow = worksheet.getFirstDataRowNumber();
+        int maxRow = worksheet.getLastDataRowNumber();
+        assertEquals(-1, minRow);
+        assertEquals(-1, maxRow);
+    }
+
 }
diff --git a/NanoXLSX4j.Lib/src/test/java/ch/rabanti/nanoxlsx4j/worksheets/GetRowBoundariesTest.java b/NanoXLSX4j.Lib/src/test/java/ch/rabanti/nanoxlsx4j/worksheets/GetRowBoundariesTest.java
@@ -462,4 +462,23 @@ void getFirstOrLastDataColumnNumberTest2() {
         assertEquals(4, minRow);
         assertEquals(4, maxRow);
     }
+
+    @DisplayName("Test of the getFirstDataColumnNumber and getLastDataColumnNumber functions with an explicitly defined, empty cell with empty string besides other column definitions")
+    @ParameterizedTest(name = "Given empty cell address {0} should lead to -1 as  first and last row")
+    @CsvSource(
+            {
+                    "'F5'",
+                    "'A1'"}
+    )
+    public void getFirstOrLastDataColumnNumberTest3(String emptyCellAddress)
+    {
+        Worksheet worksheet = new Worksheet();
+        worksheet.addHiddenColumn(3);
+        worksheet.addHiddenColumn(4);
+        worksheet.addCell("", emptyCellAddress);
+        int minColumn = worksheet.getFirstDataColumnNumber();
+        int maxColumn = worksheet.getLastDataColumnNumber();
+        assertEquals(-1, minColumn);
+        assertEquals(-1, maxColumn);
+    }
 }
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>ch.rabanti</groupId>
     <artifactId>nanoxlsx4j-root</artifactId>
     <packaging>pom</packaging>
-    <version>2.4.1</version>
+    <version>2.4.2</version>
     <modules>
         <module>NanoXLSX4j.Lib</module>
         <!-- Do not add this to build -->