qmap: reinstate short yaml format

univie-nutrition · Jun 19, 2024 · 2786797 · 2786797
1 parent c1f9d0a
commit 2786797
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/commons/src/main/java/dita/commons/qmap/Dtos.java b/commons/src/main/java/dita/commons/qmap/Dtos.java
@@ -69,7 +69,7 @@ QualifiedMapEntry fromDto(final QualifiedMapEntryDto dto) {
     // -- QUALIFIED MAP
 
     public record QualifiedMapDto(
-            Collection<QualifiedMapEntry> qualifiedMapEntries) {
+            Collection<QualifiedMapEntryDto> qualifiedMapEntries) {
         public String toYaml() {
             return YamlUtils.toStringUtf8(this, yamlOptions());
         }
@@ -82,13 +82,17 @@ public static Try<QualifiedMapDto> tryFromYaml(@Nullable final DataSource ds) {
 
     QualifiedMapDto toDto(final QualifiedMap map) {
         return new QualifiedMapDto(
-                map.streamEntries().toList());
+                map.streamEntries()
+                    .map(Dtos::toDto)
+                    .toList());
     }
 
     QualifiedMap fromDto(@Nullable final QualifiedMapDto dto, Policy policy) {
         if(dto==null) return null;
         var map = new QualifiedMap(new ConcurrentHashMap<>(), policy);
-        dto.qualifiedMapEntries.forEach(map::put);
+        dto.qualifiedMapEntries.stream()
+            .map(Dtos::fromDto)
+            .forEach(map::put);
         return map;
     }