Add @ExcelCellRange support and tests for records to improve coverage

Co-authored-by: ozlerhakan <[email protected]>

Author: Copilot

pom.xml

@@ -233,6 +233,7 @@
                                     <release>11</release>
                                     <testExcludes>
                                         <exclude>**/model/byid/CalculationRecord.java</exclude>
+                                        <exclude>**/model/byid/ClassesRecord.java</exclude>
                                         <exclude>**/model/byname/EmployeeRecord.java</exclude>
                                         <exclude>**/model/byname/PersonRecord.java</exclude>
                                         <exclude>**/model/byname/OrgWithUnknownCellsRecord.java</exclude>

src/main/java/com/poiji/bind/mapping/PoijiHandler.java

@@ -85,11 +85,21 @@ private void setFieldValue(String content, Class<? super T> subclass, int column
      **/
     private Object getInstance(Field field) {
         Object ins;
-        if (fieldInstances.containsKey(field.getName())) {
-            ins = fieldInstances.get(field.getName());
+        if (isRecord) {
+            // For records, check recordValues for nested objects
+            if (recordValues.containsKey(field.getName())) {
+                ins = recordValues.get(field.getName());
+            } else {
+                ins = ReflectUtil.newInstanceOf(field.getType());
+                recordValues.put(field.getName(), ins);
+            }
         } else {
-            ins = ReflectUtil.newInstanceOf(field.getType());
-            fieldInstances.put(field.getName(), ins);
+            if (fieldInstances.containsKey(field.getName())) {
+                ins = fieldInstances.get(field.getName());
+            } else {
+                ins = ReflectUtil.newInstanceOf(field.getType());
+                fieldInstances.put(field.getName(), ins);
+            }
         }
         return ins;
     }

src/test/java/com/poiji/deserialize/RecordDeserializationTest.java

@@ -3,6 +3,7 @@
 import com.poiji.bind.Poiji;
 import com.poiji.deserialize.model.AlbumRecord;
 import com.poiji.deserialize.model.byid.CalculationRecord;
+import com.poiji.deserialize.model.byid.ClassesRecord;
 import com.poiji.deserialize.model.byname.EmployeeRecord;
 import com.poiji.deserialize.model.byname.OrgWithUnknownCellsRecord;
 import com.poiji.deserialize.model.byname.PersonRecord;
@@ -400,4 +401,51 @@ public void shouldMapXLSToRecordWithExcelCellsJoinedByName() {
         assertThat(album.tracks(), notNullValue());
         assertThat(album.tracks().size(), is(2)); // Track1 and Track2
     }
+
+    @Test
+    public void shouldMapExcelToRecordWithExcelCellRange() {
+        // Test with @ExcelCellRange annotation
+        List<ClassesRecord> classes = Poiji.fromExcel(
+                new File("src/test/resources/test_multi.xlsx"),
+                ClassesRecord.class,
+                PoijiOptions.PoijiOptionsBuilder.settings(1)
+                        .headerStart(1)
+                        .build()
+        );
+
+        assertThat(classes, notNullValue());
+        assertThat(classes.size(), is(3));
+
+        ClassesRecord firstClass = classes.get(0);
+        assertThat(firstClass.classA(), notNullValue());
+        assertThat(firstClass.classA().getAge(), is(28));
+        
+        assertThat(firstClass.classB(), notNullValue());
+        assertThat(firstClass.classB().getCity(), is("Los Angeles"));
+        
+        ClassesRecord secondClass = classes.get(1);
+        assertThat(secondClass.classA().getName(), is("Paul Ryan"));
+        assertThat(secondClass.classB().getState(), is("Virginia"));
+        assertThat(secondClass.classB().getZip(), is(22347));
+    }
+
+    @Test
+    public void shouldMapXLSToRecordWithExcelCellRange() {
+        // Test XLS format with @ExcelCellRange annotation
+        List<ClassesRecord> classes = Poiji.fromExcel(
+                new File("src/test/resources/test_multi.xls"),
+                ClassesRecord.class,
+                PoijiOptions.PoijiOptionsBuilder.settings(1)
+                        .headerStart(1)
+                        .build()
+        );
+
+        assertThat(classes, notNullValue());
+        assertThat(classes.size(), is(3));
+
+        // Verify nested fields are properly mapped
+        ClassesRecord secondClass = classes.get(1);
+        assertThat(secondClass.classA(), notNullValue());
+        assertThat(secondClass.classB(), notNullValue());
+    }
 }

src/test/java/com/poiji/deserialize/model/byid/ClassesRecord.java

@@ -0,0 +1,15 @@
+package com.poiji.deserialize.model.byid;
+
+import com.poiji.annotation.ExcelCellRange;
+
+/**
+ * Record class to test @ExcelCellRange support
+ */
+public record ClassesRecord(
+        @ExcelCellRange
+        PersonATest classA,
+        
+        @ExcelCellRange
+        PersonBTest classB
+) {
+}