[2.26.x] Fix multi-value exports for RTF (#6767)

codice · Oct 6, 2023 · 10b488e · 10b488e
1 parent 14658fb
commit 10b488e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/...ransformer-rtf/src/main/java/ddf/catalog/transformer/output/rtf/model/ExportCategory.java b/...ransformer-rtf/src/main/java/ddf/catalog/transformer/output/rtf/model/ExportCategory.java
@@ -144,7 +144,11 @@ private ExportValue emptyValue() {
 
   private ExportValue simpleValue(Attribute attribute) {
     return new JustValue(
-        Optional.ofNullable(attribute.getValue()).map(Object::toString).orElse(null),
+        Optional.ofNullable(
+                attribute.getValues().stream()
+                    .map(Object::toString)
+                    .collect(Collectors.joining(", ")))
+            .orElse(null),
         ValueType.SIMPLE);
   }
 

diff --git a/...ansformer-rtf/src/test/java/ddf/catalog/transformer/output/rtf/BaseTestConfiguration.java b/...ansformer-rtf/src/test/java/ddf/catalog/transformer/output/rtf/BaseTestConfiguration.java
@@ -225,14 +225,14 @@ Attribute createGifThumbnailAttribute() throws IOException {
   Attribute createExtendedAttribute() {
     Attribute mockAttribute = mock(Attribute.class);
     when(mockAttribute.getValue()).thenReturn("Extended Value");
-
+    when(mockAttribute.getValues()).thenReturn(Collections.singletonList("Extended Value"));
     return mockAttribute;
   }
 
   Attribute createSimpleAttribute() {
     Attribute mockAttribute = mock(Attribute.class);
     when(mockAttribute.getValue()).thenReturn("Simple value");
-
+    when(mockAttribute.getValues()).thenReturn(Collections.singletonList("Simple value"));
     return mockAttribute;
   }