From f3bb1ef8de3fd3a0e28be26ca68cd1aa310c1702 Mon Sep 17 00:00:00 2001
From: lskublik <lskublik@evolveum.com>
Date: Thu, 27 May 2021 14:52:53 +0200
Subject: [PATCH] fix using of path evaluator for basic type of variable

---
 .../initial-objects/090-report-audit.xml      | 79 ++-----------------
 .../100-report-reconciliation.xml             | 44 +----------
 .../initial-objects/110-report-user-list.xml  | 60 +-------------
 .../150-report-certification-cases.xml        |  9 +--
 .../160-report-certification-decisions.xml    |  9 +--
 .../path/PathExpressionEvaluation.java        |  9 +++
 6 files changed, 26 insertions(+), 184 deletions(-)

diff --git a/gui/admin-gui/src/main/resources/initial-objects/090-report-audit.xml b/gui/admin-gui/src/main/resources/initial-objects/090-report-audit.xml
index 1704e9025ea..d10e59eeb5f 100644
--- a/gui/admin-gui/src/main/resources/initial-objects/090-report-audit.xml
+++ b/gui/admin-gui/src/main/resources/initial-objects/090-report-audit.xml
@@ -26,114 +26,49 @@
                         <q:path>targetRef</q:path>
                         <expression>
                             <queryInterpretationOfNoValue>filterAll</queryInterpretationOfNoValue>
-                            <script>
-                                <objectVariableMode>prismReference</objectVariableMode>
-                                <code>
-                                    import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType;
-
-                                    if (!target) {
-                                        return null;
-                                    }
-
-                                    ObjectReferenceType ort = new ObjectReferenceType();
-                                    ort.setOid(target.getOid());
-                                    ort.setRelation(target.getRelation());
-                                    ort.setType(target.getTargetType());
-                                    return ort;
-                                </code>
-                            </script>
+                            <path>$target</path>
                         </expression>
                     </q:ref>
                     <q:ref>
                         <q:path>initiatorRef</q:path>
                         <expression>
                             <queryInterpretationOfNoValue>filterAll</queryInterpretationOfNoValue>
-                            <script>
-                                <objectVariableMode>prismReference</objectVariableMode>
-                                <code>
-                                    import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType;
-
-                                    if (!initiator) {
-                                        return null;
-                                    }
-
-                                    ObjectReferenceType ort = new ObjectReferenceType();
-                                    ort.setOid(initiator.getOid());
-                                    ort.setRelation(initiator.getRelation());
-                                    ort.setType(initiator.getTargetType());
-                                    return ort;
-                                </code>
-                            </script>
+                            <path>$initiator</path>
                         </expression>
                     </q:ref>
                     <q:equal>
                         <q:path>outcome</q:path>
                         <expression>
                             <queryInterpretationOfNoValue>filterAll</queryInterpretationOfNoValue>
-                            <script>
-                                <code>
-                                    if (!outcome) {
-                                        return null;
-                                    }
-                                    return outcome;
-                                </code>
-                            </script>
+                            <path>$outcome</path>
                         </expression>
                     </q:equal>
                     <q:equal>
                         <q:path>eventType</q:path>
                         <expression>
                             <queryInterpretationOfNoValue>filterAll</queryInterpretationOfNoValue>
-                            <script>
-                                <code>
-                                    if (!eventType) {
-                                        return null;
-                                    }
-                                    return eventType;
-                                </code>
-                            </script>
+                            <path>$eventType</path>
                         </expression>
                     </q:equal>
                     <q:equal>
                         <q:path>eventStage</q:path>
                         <expression>
                             <queryInterpretationOfNoValue>filterAll</queryInterpretationOfNoValue>
-                            <script>
-                                <code>
-                                    if (!eventStage) {
-                                        return null;
-                                    }
-                                    return eventStage;
-                                </code>
-                            </script>
+                            <path>$eventStage</path>
                         </expression>
                     </q:equal>
                     <q:greater>
                         <q:path>timestamp</q:path>
                         <expression>
                             <queryInterpretationOfNoValue>filterAll</queryInterpretationOfNoValue>
-                            <script>
-                                <code>
-                                    if (!from) {
-                                        return null;
-                                    }
-                                    return from;
-                                </code>
-                            </script>
+                            <path>$from</path>
                         </expression>
                     </q:greater>
                     <q:less>
                         <q:path>timestamp</q:path>
                         <expression>
                             <queryInterpretationOfNoValue>filterAll</queryInterpretationOfNoValue>
-                            <script>
-                                <code>
-                                    if (!to) {
-                                        return null;
-                                    }
-                                    return to;
-                                </code>
-                            </script>
+                            <path>$to</path>
                         </expression>
                     </q:less>
                 </q:and>
diff --git a/gui/admin-gui/src/main/resources/initial-objects/100-report-reconciliation.xml b/gui/admin-gui/src/main/resources/initial-objects/100-report-reconciliation.xml
index 147ab42051e..82cc0e7b5f2 100644
--- a/gui/admin-gui/src/main/resources/initial-objects/100-report-reconciliation.xml
+++ b/gui/admin-gui/src/main/resources/initial-objects/100-report-reconciliation.xml
@@ -26,36 +26,14 @@
                         <q:path>resourceRef</q:path>
                         <expression>
                             <queryInterpretationOfNoValue>filterAll</queryInterpretationOfNoValue>
-                            <script>
-                                <objectVariableMode>prismReference</objectVariableMode>
-                                <code>
-                                    import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType;
-
-                                    if (!resource) {
-                                        return null;
-                                    }
-
-                                    ObjectReferenceType ort = new ObjectReferenceType();
-                                    ort.setOid(resource.getOid());
-                                    ort.setRelation(resource.getRelation());
-                                    ort.setType(resource.getTargetType());
-                                    return ort;
-                                </code>
-                            </script>
+                            <path>$resource</path>
                         </expression>
                     </q:ref>
                     <q:equal>
                         <q:path>synchronizationSituation</q:path>
                         <expression>
                             <queryInterpretationOfNoValue>filterAll</queryInterpretationOfNoValue>
-                            <script>
-                                <code>
-                                    if (!situation) {
-                                        return null;
-                                    }
-                                    return situation;
-                                </code>
-                            </script>
+                            <path>$situation</path>
                         </expression>
                     </q:equal>
                     <q:equal>
@@ -75,28 +53,14 @@
                         <q:path>kind</q:path>
                         <expression>
                             <queryInterpretationOfNoValue>filterAll</queryInterpretationOfNoValue>
-                            <script>
-                                <code>
-                                    if (!kind) {
-                                        return null;
-                                    }
-                                    return kind;
-                                </code>
-                            </script>
+                            <path>$kind</path>
                         </expression>
                     </q:equal>
                     <q:equal>
                         <q:path>intent</q:path>
                         <expression>
                             <queryInterpretationOfNoValue>filterAll</queryInterpretationOfNoValue>
-                            <script>
-                                <code>
-                                    if (!intent) {
-                                        return null;
-                                    }
-                                    return intent;
-                                </code>
-                            </script>
+                            <path>$intent</path>
                         </expression>
                     </q:equal>
                 </q:and>
diff --git a/gui/admin-gui/src/main/resources/initial-objects/110-report-user-list.xml b/gui/admin-gui/src/main/resources/initial-objects/110-report-user-list.xml
index 1d4c9ca25fb..cae83fe5969 100644
--- a/gui/admin-gui/src/main/resources/initial-objects/110-report-user-list.xml
+++ b/gui/admin-gui/src/main/resources/initial-objects/110-report-user-list.xml
@@ -23,80 +23,28 @@
                         <q:path>activation/administrativeStatus</q:path>
                         <expression>
                             <queryInterpretationOfNoValue>filterAll</queryInterpretationOfNoValue>
-                            <script>
-                                <code>
-                                    if (!activation) {
-                                        return null;
-                                    }
-                                    return activation;
-                                </code>
-                            </script>
+                            <path>$activation</path>
                         </expression>
                     </q:equal>
                     <q:ref>
                         <q:path>assignment/targetRef</q:path>
                         <expression>
                             <queryInterpretationOfNoValue>filterAll</queryInterpretationOfNoValue>
-                            <script>
-                                <objectVariableMode>prismReference</objectVariableMode>
-                                <code>
-                                    import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType;
-
-                                    if (!organization) {
-                                    return null;
-                                    }
-
-                                    ObjectReferenceType ort = new ObjectReferenceType();
-                                    ort.setOid(organization.getOid());
-                                    ort.setRelation(organization.getRelation());
-                                    ort.setType(organization.getTargetType());
-                                    return ort;
-                                </code>
-                            </script>
+                            <path>$organization</path>
                         </expression>
                     </q:ref>
                     <q:ref>
                         <q:path>assignment/targetRef</q:path>
                         <expression>
                             <queryInterpretationOfNoValue>filterAll</queryInterpretationOfNoValue>
-                            <script>
-                                <objectVariableMode>prismReference</objectVariableMode>
-                                <code>
-                                    import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType;
-
-                                    if (!role) {
-                                    return null;
-                                    }
-
-                                    ObjectReferenceType ort = new ObjectReferenceType();
-                                    ort.setOid(role.getOid());
-                                    ort.setRelation(role.getRelation());
-                                    ort.setType(role.getTargetType());
-                                    return ort;
-                                </code>
-                            </script>
+                            <path>$role</path>
                         </expression>
                     </q:ref>
                     <q:ref>
                         <q:path>assignment/construction/resourceRef</q:path>
                         <expression>
                             <queryInterpretationOfNoValue>filterAll</queryInterpretationOfNoValue>
-                            <script>
-                                <objectVariableMode>prismReference</objectVariableMode>
-                                <code>
-                                    import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType;
-
-                                    if (!resource) {
-                                    return null;
-                                    }
-
-                                    ObjectReferenceType ort = new ObjectReferenceType();
-                                    ort.setOid(resource.getOid());
-                                    ort.setRelation(resource.getRelation());
-                                    ort.setType(resource.getTargetType());
-                                    return ort;
-                                </code>
-                            </script>
+                            <path>$resource</path>
                         </expression>
                     </q:ref>
                 </q:and>
diff --git a/gui/admin-gui/src/main/resources/initial-objects/150-report-certification-cases.xml b/gui/admin-gui/src/main/resources/initial-objects/150-report-certification-cases.xml
index 86868f09e65..882e35d420e 100644
--- a/gui/admin-gui/src/main/resources/initial-objects/150-report-certification-cases.xml
+++ b/gui/admin-gui/src/main/resources/initial-objects/150-report-certification-cases.xml
@@ -21,14 +21,7 @@
                     <q:path>../name</q:path>
                     <expression>
                         <queryInterpretationOfNoValue>filterAll</queryInterpretationOfNoValue>
-                        <script>
-                            <code>
-                                if (!campaignName) {
-                                return null;
-                                }
-                                return campaignName.getName();
-                            </code>
-                        </script>
+                        <path>$campaignName</path>
                     </expression>
                 </q:equal>
             </filter>
diff --git a/gui/admin-gui/src/main/resources/initial-objects/160-report-certification-decisions.xml b/gui/admin-gui/src/main/resources/initial-objects/160-report-certification-decisions.xml
index 386cfd4cbbc..55c2437d0b7 100644
--- a/gui/admin-gui/src/main/resources/initial-objects/160-report-certification-decisions.xml
+++ b/gui/admin-gui/src/main/resources/initial-objects/160-report-certification-decisions.xml
@@ -21,14 +21,7 @@
                     <q:path>../name</q:path>
                     <expression>
                         <queryInterpretationOfNoValue>filterAll</queryInterpretationOfNoValue>
-                        <script>
-                            <code>
-                                if (!campaignName) {
-                                return null;
-                                }
-                                return campaignName.getName();
-                            </code>
-                        </script>
+                        <path>$campaignName</path>
                     </expression>
                 </q:equal>
             </filter>
diff --git a/model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/path/PathExpressionEvaluation.java b/model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/path/PathExpressionEvaluation.java
index 7c359fa51c4..57371606052 100644
--- a/model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/path/PathExpressionEvaluation.java
+++ b/model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/path/PathExpressionEvaluation.java
@@ -87,6 +87,15 @@ private ResolutionContext getInitialResolveContextFromVariable() throws Expressi
             return IdiResolutionContext.fromAnyObject(variableValue);
         } else if (variableValue instanceof PrismValue) {
             return new ValueResolutionContext((PrismValue) variableValue, context.getContextDescription());
+        } else if (!(variableValue instanceof Containerable) && variableValueAndDefinition.getTypeClass().isAssignableFrom(variableValue.getClass())) {
+            V prismValue;
+            if (variableValue instanceof Referencable){
+                prismValue = (V) evaluator.getPrismContext().itemFactory().createReferenceValue(((Referencable) variableValue).getOid(), ((Referencable) variableValue).getType());
+                ((PrismReferenceValue)prismValue).setRelation(((Referencable)variableValue).getRelation());
+            } else {
+                prismValue = (V) evaluator.getPrismContext().itemFactory().createPropertyValue(variableValue);
+            }
+            return new ValueResolutionContext(prismValue, context.getContextDescription());
         } else {
             throw new ExpressionEvaluationException("Unexpected variable value "+variableValue+" ("+variableValue.getClass()+")");
         }