MID-7942:fix for custom 'null' function parameter when mP can't deter…

…mine type of parameter
Evolveum · May 19, 2022 · 79e1c99 · 79e1c99
1 parent 78b9102
commit 79e1c99
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 1 deletion.
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
@@ -193,7 +193,11 @@ private TypedValue<?> convertInput(Map.Entry<String, Object> entry, ExpressionTy
 
         Class<?> valueClass;
         if (value == null) {
-            valueClass = expressionParameterClass;
+            if (expressionParameterClass == null) {
+                valueClass = Object.class;
+            } else {
+                valueClass = expressionParameterClass;
+            }
         } else {
             valueClass = value.getClass();
         }

diff --git a/.../model-impl/src/test/java/com/evolveum/midpoint/model/impl/expr/TestModelExpressions.java b/.../model-impl/src/test/java/com/evolveum/midpoint/model/impl/expr/TestModelExpressions.java
@@ -319,6 +319,15 @@ public void testCustomFunctionUntyped() throws Exception {
         assertExecuteScriptExpressionString(variables, "s-1");
     }
 
+    @Test
+    public void testCustomFunctionUntypedNullValue() throws Exception {
+        VariablesMap variables = VariablesMap.create(prismContext,
+                "var1", null, PrimitiveType.STRING,
+                "var2", null, PrimitiveType.STRING);
+
+        assertExecuteScriptExpressionString(variables, "null-null");
+    }
+
     @NotNull
     private PrismContainerValue<Containerable> createCustomValue() throws SchemaException {
         return createCustomContainer().getValue();

diff --git a/model/model-impl/src/test/resources/expr/expression-testCustomFunctionUntypedNullValue.xml b/model/model-impl/src/test/resources/expr/expression-testCustomFunctionUntypedNullValue.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2010-2017 Evolveum and contributors
+  ~
+  ~ This work is dual-licensed under the Apache License 2.0
+  ~ and European Union Public License. See LICENSE file for details.
+  -->
+
+<script xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3">
+    <code>
+        import com.evolveum.midpoint.prism.path.ItemPath
+
+        pcv = functionLibrary.execute("untyped", [container: var1, containerValue: var2])
+        pcv?.findProperty(ItemPath.create('stringValue'))?.getRealValue() + '-' +
+                pcv?.findProperty(ItemPath.create('intValue'))?.getRealValue()
+    </code>
+</script>