Fix "not serializable" issues for correlation

Evolveum · Jan 16, 2024 · 08f9bed · 08f9bed
1 parent 362f48b
commit 08f9bed
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/...src/main/java/com/evolveum/midpoint/model/api/correlation/CorrelationCaseDescription.java b/...src/main/java/com/evolveum/midpoint/model/api/correlation/CorrelationCaseDescription.java
@@ -9,7 +9,6 @@
 
 import java.io.Serializable;
 import java.util.*;
-import java.util.stream.Collectors;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -196,8 +195,8 @@ public CorrelationPropertyValuesDescription(
                 @NotNull Set<PrismValue> secondaryValues,
                 @NotNull Match match) {
             this.propertyDefinition = propertyDefinition;
-            this.primaryValues = primaryValues;
-            this.secondaryValues = secondaryValues;
+            this.primaryValues = Set.copyOf(primaryValues); // to be serializable
+            this.secondaryValues = Set.copyOf(secondaryValues); // to be serializable
             this.match = match;
         }
 
@@ -223,9 +222,16 @@ public String toString() {
 
         private List<String> dump(Collection<PrismValue> values) {
             return values.stream()
-                    .map(PrismValue::getRealValue)
+                    .map(prismValue -> {
+                        try {
+                            return prismValue.getRealValue();
+                        } catch (Exception e) {
+                            // getRealValue may throw an exception in rare cases (for containers, maybe)
+                            return prismValue.toString();
+                        }
+                    })
                     .map(String::valueOf)
-                    .collect(Collectors.toList());
+                    .toList();
         }
     }
 

diff --git a/...main/java/com/evolveum/midpoint/model/api/correlator/CompositeCorrelationExplanation.java b/...main/java/com/evolveum/midpoint/model/api/correlator/CompositeCorrelationExplanation.java
@@ -88,7 +88,7 @@ public ChildCorrelationExplanationRecord(
             this.explanation = explanation;
             this.weight = weight;
             this.confidenceIncrement = confidenceIncrement;
-            this.ignoredBecause = ignoredBecause;
+            this.ignoredBecause = Set.copyOf(ignoredBecause); // to be serializable
         }
 
         @Override