Add tests for @ExcelCellsJoinedByName with records

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

Author: Copilot

pom.xml

@@ -236,6 +236,7 @@
                                         <exclude>**/model/byname/EmployeeRecord.java</exclude>
                                         <exclude>**/model/byname/PersonRecord.java</exclude>
                                         <exclude>**/model/byname/OrgWithUnknownCellsRecord.java</exclude>
+                                        <exclude>**/model/AlbumRecord.java</exclude>
                                         <exclude>**/RecordDeserializationTest.java</exclude>
                                     </testExcludes>
                                 </configuration>

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

@@ -297,9 +297,13 @@ private <T> void constructTypeValueForRecord(Row currentRow, Map<String, Object>
             } else {
                 String titleColumn = indexToTitle.get(annotationDetail.getColumn());
                 titleColumn = titleColumn.replaceAll("@[0-9]+", "");
-                // For records with MultiValuedMap, we can't use the same approach
-                // Store it as a simple value for now
-                recordValues.put(field.getName(), data);
+                // For records with MultiValuedMap, we need to collect values into the map
+                MultiValuedMap<String, Object> fieldMap = (MultiValuedMap<String, Object>) recordValues.get(field.getName());
+                if (fieldMap == null) {
+                    fieldMap = new org.apache.commons.collections4.multimap.ArrayListValuedHashMap<>();
+                    recordValues.put(field.getName(), fieldMap);
+                }
+                fieldMap.put(titleColumn, data);
             }
         } else if (annotationDetail.isMandatoryCell()) {
             throw new PoijiRowSpecificException(annotationDetail.getColumnName(), field.getName(),

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

@@ -12,6 +12,7 @@
 import com.poiji.option.PoijiOptions;
 import com.poiji.util.AnnotationUtil;
 import com.poiji.util.ReflectUtil;
+import org.apache.commons.collections4.MultiValuedMap;
 import org.apache.poi.ss.util.CellAddress;
 import org.apache.poi.util.StringUtil;
 import org.apache.poi.xssf.eventusermodel.XSSFSheetXMLHandler.SheetContentsHandler;
@@ -233,8 +234,13 @@ private boolean setValue(Field field, int column, String content, Object ins) {
             if (pattern.matcher(titleColumn).matches()) {
                 Object o = casting.castValue(field, content, internalRow, column, options);
                 if (isRecord && ins == null) {
-                    // For records, MultiValuedMap is not supported in the same way
-                    recordValues.put(field.getName(), o);
+                    // For records, we need to collect values into a MultiValuedMap
+                    MultiValuedMap<String, Object> fieldMap = (MultiValuedMap<String, Object>) recordValues.get(field.getName());
+                    if (fieldMap == null) {
+                        fieldMap = new org.apache.commons.collections4.multimap.ArrayListValuedHashMap<>();
+                        recordValues.put(field.getName(), fieldMap);
+                    }
+                    fieldMap.put(titleColumn, o);
                 } else {
                     ReflectUtil.putFieldMultiValueMapData(field, titleColumn, o, ins);
                 }

src/main/java/com/poiji/util/ReflectUtil.java

@@ -70,9 +70,20 @@ public static <T> T newRecordInstance(Class<T> type, Map<String, Object> recordV
                 parameterTypes[i] = componentType;
                 Object value = recordValues.get(componentName);
 
-                // If value is null, use default values for primitives
-                if (value == null && componentType.isPrimitive()) {
-                    value = getDefaultValue(componentType);
+                // If value is null, use default values for primitives or create empty MultiValuedMap
+                if (value == null) {
+                    if (componentType.isPrimitive()) {
+                        value = getDefaultValue(componentType);
+                    } else if (componentType.getName().contains("MultiValuedMap")) {
+                        // Create empty MultiValuedMap for null values
+                        try {
+                            value = Class.forName("org.apache.commons.collections4.multimap.ArrayListValuedHashMap")
+                                    .getDeclaredConstructor()
+                                    .newInstance();
+                        } catch (Exception e) {
+                            // If we can't create ArrayListValuedHashMap, leave as null
+                        }
+                    }
                 }
 
                 args[i] = value;

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

@@ -1,6 +1,7 @@
 package com.poiji.deserialize;
 
 import com.poiji.bind.Poiji;
+import com.poiji.deserialize.model.AlbumRecord;
 import com.poiji.deserialize.model.byid.CalculationRecord;
 import com.poiji.deserialize.model.byname.EmployeeRecord;
 import com.poiji.deserialize.model.byname.OrgWithUnknownCellsRecord;
@@ -345,4 +346,58 @@ public void shouldMapXLSToRecordWithUnknownCells() {
         assertThat(firstRow.unknownCells(), notNullValue());
         assertThat(firstRow.unknownCells().containsKey("Region"), is(true));
     }
+
+    @Test
+    public void shouldMapExcelToRecordWithExcelCellsJoinedByName() {
+        // Test with @ExcelCellsJoinedByName annotation
+        List<AlbumRecord> albums = Poiji.fromExcel(
+                new File("src/test/resources/regex/album.xlsx"),
+                AlbumRecord.class,
+                PoijiOptions.PoijiOptionsBuilder.settings()
+                        .sheetName("Sheet 1")
+                        .build()
+        );
+
+        assertThat(albums, notNullValue());
+        assertThat(albums.size(), is(1));
+
+        AlbumRecord album = albums.get(0);
+        
+        // Verify artists are collected correctly
+        assertThat(album.artists(), notNullValue());
+        assertThat(album.artists().get("Artist").size(), is(3));
+        assertThat(album.artists().get("Artist").contains("Michael Jackson"), is(true));
+        assertThat(album.artists().get("Artist").contains("Lionel Richie"), is(true));
+        assertThat(album.artists().get("Artist").contains("Stevie Wonder"), is(true));
+
+        // Verify tracks are collected correctly with regex pattern
+        assertThat(album.tracks(), notNullValue());
+        assertThat(album.tracks().get("Track1").size(), is(1));
+        assertThat(album.tracks().get("Track1").contains("We are the World"), is(true));
+        assertThat(album.tracks().get("Track2").size(), is(1));
+        assertThat(album.tracks().get("Track2").contains("We are the World (instrumental)"), is(true));
+    }
+
+    @Test
+    public void shouldMapXLSToRecordWithExcelCellsJoinedByName() {
+        // Test XLS format with @ExcelCellsJoinedByName annotation
+        List<AlbumRecord> albums = Poiji.fromExcel(
+                new File("src/test/resources/regex/album.xls"),
+                AlbumRecord.class,
+                PoijiOptions.PoijiOptionsBuilder.settings()
+                        .sheetName("Sheet 1")
+                        .build()
+        );
+
+        assertThat(albums, notNullValue());
+        assertThat(albums.size(), is(1));
+
+        AlbumRecord album = albums.get(0);
+        
+        // Verify collected values work correctly in XLS format
+        assertThat(album.artists(), notNullValue());
+        assertThat(album.artists().get("Artist").size(), is(3));
+        assertThat(album.tracks(), notNullValue());
+        assertThat(album.tracks().size(), is(2)); // Track1 and Track2
+    }
 }

src/test/java/com/poiji/deserialize/model/AlbumRecord.java

@@ -0,0 +1,16 @@
+package com.poiji.deserialize.model;
+
+import com.poiji.annotation.ExcelCellsJoinedByName;
+import org.apache.commons.collections4.MultiValuedMap;
+
+/**
+ * A record class to test @ExcelCellsJoinedByName support
+ */
+public record AlbumRecord(
+        @ExcelCellsJoinedByName(expression = "Artist")
+        MultiValuedMap<String, String> artists,
+
+        @ExcelCellsJoinedByName(expression = "Track[0-9]+")
+        MultiValuedMap<String, String> tracks
+) {
+}