Add forgotten changes

(Relates to 2e7286a.)
Evolveum · Sep 9, 2022 · b285f6f · b285f6f
1 parent 1571728
commit b285f6f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 18 deletions.
diff --git a/...rc/main/java/com/evolveum/midpoint/model/common/expression/functions/CustomFunctions.java b/...rc/main/java/com/evolveum/midpoint/model/common/expression/functions/CustomFunctions.java
@@ -137,6 +137,7 @@ public <V extends PrismValue, D extends ItemDefinition> Object execute(String fu
             }
 
             if (outputDefinition.isMultiValue()) {
+                // This is a problem if the triple contains dynamically-typed PCVs. See MID-6775.
                 return PrismValueCollectionsUtil.getRealValuesOfCollection(nonNegativeValues);
             }
 
@@ -146,6 +147,8 @@ public <V extends PrismValue, D extends ItemDefinition> Object execute(String fu
                         + nonNegativeValues.size() + ") in " + shortDesc);
             }
 
+            // This is a problem if the triple contains dynamically-typed PCVs. See MID-6775.
+            // Currently, it is hacked by wrapping these values to a PPV.
             return nonNegativeValues.iterator().next().getRealValue();
 
 

diff --git a/testing/story/src/test/resources/correlation/idmatch/medium/object-template-user.xml b/testing/story/src/test/resources/correlation/idmatch/medium/object-template-user.xml
@@ -67,6 +67,8 @@
             <expression>
                 <script>
                     <code>
+                        import com.evolveum.midpoint.util.MiscUtil
+
                         import static com.evolveum.midpoint.testing.story.correlation.TestInternalCorrelationMedium.RESOURCE_EXTERNAL
                         import static com.evolveum.midpoint.testing.story.correlation.TestInternalCorrelationMedium.RESOURCE_HR
                         import static com.evolveum.midpoint.testing.story.correlation.TestInternalCorrelationMedium.RESOURCE_SIS
@@ -85,15 +87,7 @@
                         def hr = sources.find { it.resourceRef?.oid == RESOURCE_HR.oid }
                         def external = sources.find { it.resourceRef?.oid == RESOURCE_EXTERNAL.oid }
 
-                        if (sis != null) {
-                            sis.clone()
-                        } else if (hr != null) {
-                            hr.clone()
-                        } else if (external != null) {
-                            external.clone()
-                        } else {
-                            null // takes all values (should be "none"
-                        }
+                        MiscUtil.getFirstNonNull(sis, hr, external)
                     </code>
                 </script>
             </expression>

diff --git a/testing/story/src/test/resources/correlation/internal/medium/object-template-user.xml b/testing/story/src/test/resources/correlation/internal/medium/object-template-user.xml
@@ -68,6 +68,8 @@
             <expression>
                 <script>
                     <code>
+                        import com.evolveum.midpoint.util.MiscUtil
+
                         import static com.evolveum.midpoint.testing.story.correlation.TestInternalCorrelationMedium.RESOURCE_EXTERNAL
                         import static com.evolveum.midpoint.testing.story.correlation.TestInternalCorrelationMedium.RESOURCE_HR
                         import static com.evolveum.midpoint.testing.story.correlation.TestInternalCorrelationMedium.RESOURCE_SIS
@@ -86,15 +88,7 @@
                         def hr = sources.find { it.resourceRef?.oid == RESOURCE_HR.oid }
                         def external = sources.find { it.resourceRef?.oid == RESOURCE_EXTERNAL.oid }
 
-                        if (sis != null) {
-                            sis.clone()
-                        } else if (hr != null) {
-                            hr.clone()
-                        } else if (external != null) {
-                            external.clone()
-                        } else {
-                            null // takes all values (should be "none")
-                        }
+                        MiscUtil.getFirstNonNull(sis, hr, external)
                     </code>
                 </script>
             </expression>