hotfix: key element in list

Author: Traqueur-dev

gradle.properties

@@ -1 +1 @@
-version=1.6.0
+version=1.6.1

src/main/java/fr/traqueur/structura/conversion/ValueConverter.java

@@ -1,5 +1,6 @@
 package fr.traqueur.structura.conversion;
 
+import fr.traqueur.structura.annotations.Options;
 import fr.traqueur.structura.annotations.Polymorphic;
 import fr.traqueur.structura.api.Loadable;
 import fr.traqueur.structura.exceptions.StructuraException;
@@ -208,9 +209,16 @@ private void convertPolymorphicMapEntries(Map<String, Object> valueMap, Type ele
      */
     private void convertMapEntriesToRecords(Map<String, Object> valueMap, Type elementGenericType, Class<?> elementRawType,
                                            Collection<Object> result, String prefix) {
+        boolean hasKey = hasKeyComponent(elementRawType);
         for (Map.Entry<String, Object> entry : valueMap.entrySet()) {
             Object itemValue = entry.getValue();
-            result.add(convert(itemValue, elementGenericType, elementRawType, prefix));
+            if (hasKey) {
+                // Wrap as single-entry map so isSimpleKeyMapping works correctly
+                Map<String, Object> wrappedEntry = Map.of(entry.getKey(), itemValue);
+                result.add(convert(wrappedEntry, elementGenericType, elementRawType, prefix));
+            } else {
+                result.add(convert(itemValue, elementGenericType, elementRawType, prefix));
+            }
         }
     }
 
@@ -537,4 +545,21 @@ private Map<String, Object> enrichWithDiscriminator(Object value, String discrim
 
         return valueMap;
     }
+
+    /**
+     * Checks if a record type has a component marked with @Options(isKey = true).
+     *
+     * @param recordType the record type to check
+     * @return true if the record has a key component
+     */
+    private boolean hasKeyComponent(Class<?> recordType) {
+        if (!recordType.isRecord()) {
+            return false;
+        }
+        return Arrays.stream(recordType.getRecordComponents())
+            .anyMatch(component -> {
+                Options options = component.getAnnotation(Options.class);
+                return options != null && options.isKey();
+            });
+    }
 }

src/main/resources/structura.properties

@@ -1 +1 @@
-version=1.6.0
+version=1.6.1

src/test/java/fr/traqueur/structura/conversion/ValueConverterTest.java

@@ -48,6 +48,7 @@ void setUp() {
     public Map<String, String> getStringStringMap() { return null; }
     public Map<String, Integer> getStringIntegerMap() { return null; }
     public List<TestDatabaseConfig> getDatabaseConfigList() { return null; }
+    public List<SimpleKeyRecord> getSimpleKeyRecordList() { return null; }
 
     @Nested
     @DisplayName("Complex Type Conversions")
@@ -200,6 +201,39 @@ void shouldThrowForUnsupportedCollectionTypes() throws Exception {
             );
             assertTrue(exception.getMessage().contains("Unsupported collection type"));
         }
+
+        @Test
+        @DisplayName("Should convert map of records with @Options(isKey=true) to list")
+        void shouldConvertMapOfKeyRecordsToList() throws Exception {
+            // This test case replicates the Currency/EconomiesSettings scenario
+            // where YAML map keys should become the 'id' field value
+            Map<String, Object> currenciesMap = Map.of(
+                    "first", Map.of("value-int", 100, "value-double", 10.5),
+                    "second", Map.of("value-int", 200, "value-double", 20.5),
+                    "third", Map.of("value-int", 300, "value-double", 30.5)
+            );
+
+            Type listType = ValueConverterTest.class.getMethod("getSimpleKeyRecordList").getGenericReturnType();
+
+            @SuppressWarnings("unchecked")
+            List<SimpleKeyRecord> result = (List<SimpleKeyRecord>) valueConverter.convert(
+                    currenciesMap, listType, List.class, ""
+            );
+
+            assertCollectionSize(3, result, "key record list");
+
+            // Find each record by its id (map key becomes the id field)
+            SimpleKeyRecord first = result.stream().filter(r -> "first".equals(r.id())).findFirst().orElseThrow();
+            SimpleKeyRecord second = result.stream().filter(r -> "second".equals(r.id())).findFirst().orElseThrow();
+            SimpleKeyRecord third = result.stream().filter(r -> "third".equals(r.id())).findFirst().orElseThrow();
+
+            assertEquals(100, first.valueInt());
+            assertEquals(10.5, first.valueDouble());
+            assertEquals(200, second.valueInt());
+            assertEquals(20.5, second.valueDouble());
+            assertEquals(300, third.valueInt());
+            assertEquals(30.5, third.valueDouble());
+        }
     }
 
     @Nested

src/test/java/fr/traqueur/structura/fixtures/TestFixtures.java

@@ -136,6 +136,19 @@ private TestFixtures() {} // Prevent instantiation
         debug-mode: true
         """;
 
+    public static final String KEY_RECORD_LIST_CONFIG = """
+        items:
+          first:
+            value-int: 100
+            value-double: 10.5
+          second:
+            value-int: 200
+            value-double: 20.5
+          third:
+            value-int: 300
+            value-double: 30.5
+        """;
+
     // ==================== Inline Fields ====================
 
     public static final String INLINE_CONFIG = """

src/test/java/fr/traqueur/structura/fixtures/TestModels.java

@@ -104,6 +104,10 @@ public record SimpleKeyRecord(
         @DefaultDouble(0.0) double valueDouble
     ) implements Loadable {}
 
+    public record KeyRecordListConfig(
+        List<SimpleKeyRecord> items
+    ) implements Loadable {}
+
     public record NestedKeyRecord(
         String host,
         @DefaultInt(8080) int port,

src/test/java/fr/traqueur/structura/integration/IntegrationTest.java

@@ -261,6 +261,49 @@ private StructuraProcessor getCurrentProcessor() {
         }
     }
 
+    @Nested
+    @DisplayName("Key Record List Tests")
+    class KeyRecordListTest {
+
+        @Test
+        @DisplayName("Should parse list of records with @Options(isKey=true) from YAML file")
+        void shouldParseListOfKeyRecordsFromYamlFile() throws IOException {
+            Path configFile = createTempYamlFile(KEY_RECORD_LIST_CONFIG);
+
+            try {
+                KeyRecordListConfig config = Structura.load(configFile, KeyRecordListConfig.class);
+
+                assertNotNull(config.items());
+                assertEquals(3, config.items().size());
+
+                // Find each record by its id (YAML map key becomes the id field)
+                SimpleKeyRecord first = config.items().stream()
+                        .filter(r -> "first".equals(r.id()))
+                        .findFirst()
+                        .orElseThrow(() -> new AssertionError("Record with id 'first' not found"));
+
+                SimpleKeyRecord second = config.items().stream()
+                        .filter(r -> "second".equals(r.id()))
+                        .findFirst()
+                        .orElseThrow(() -> new AssertionError("Record with id 'second' not found"));
+
+                SimpleKeyRecord third = config.items().stream()
+                        .filter(r -> "third".equals(r.id()))
+                        .findFirst()
+                        .orElseThrow(() -> new AssertionError("Record with id 'third' not found"));
+
+                assertEquals(100, first.valueInt());
+                assertEquals(10.5, first.valueDouble());
+                assertEquals(200, second.valueInt());
+                assertEquals(20.5, second.valueDouble());
+                assertEquals(300, third.valueInt());
+                assertEquals(30.5, third.valueDouble());
+            } finally {
+                deleteTempFile(configFile);
+            }
+        }
+    }
+
     @Nested
     @DisplayName("End-to-End Workflow Validation")
     class EndToEndWorkflowTest {