Fix MID-6786 preliminarily

Here we replace very ugly hack that uses t:ItemDeltaType to pass values
from library function to its clients by a little less ugly use
of t:ItemType.

The whole "solution" is still very hacky, and should be reviewed.

Overall, the support for class-less containers and their values has
to be improved.

infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/BeanMarshaller.java

@@ -89,7 +89,7 @@ public XNodeImpl marshall(@Nullable Object inputBean, @Nullable SerializationCon
             // Special hack (MID-5803) -- we should NEVER get PrismValue here; but not enough time to fix this right now
             Object bean;
             if (inputBean instanceof PrismValue) {
-                bean = ((PrismValue) inputBean).getRealValue();
+                bean = getRealValue((PrismValue) inputBean);
                 if (bean == null) {
                     return null;
                 }
@@ -129,6 +129,21 @@ public XNodeImpl marshall(@Nullable Object inputBean, @Nullable SerializationCon
         }
     }
 
+    @Nullable
+    private Object getRealValue(@NotNull PrismValue prismValue) {
+        if (prismValue instanceof PrismContainerValue<?>) {
+            PrismContainerValue<?> pcv = (PrismContainerValue<?>) prismValue;
+            if (pcv.getCompileTimeClass() != null) {
+                return prismValue.getRealValue();
+            } else {
+                // This is an ugly hack. Reconsider!
+                return new RawType(prismValue, null, prismContext);
+            }
+        } else {
+            return prismValue.getRealValue();
+        }
+    }
+
     private XNodeImpl marshalToPrimitive(Object bean, SerializationContext ctx) {
         return createPrimitiveXNode(bean, null, false, ctx);
     }

model/model-intest/src/test/resources/tracing/function-library-hacking.xml

@@ -17,11 +17,12 @@
             <name>name</name>
             <type>xsd:string</type>
         </parameter>
-        <returnType>t:ItemDeltaType</returnType>
+        <returnType>t:ItemType</returnType>
         <script>
             <code>
                 import com.evolveum.midpoint.model.intest.misc.TestTracing
                 import com.evolveum.prism.xml.ns._public.types_3.ItemDeltaType
+                import com.evolveum.prism.xml.ns._public.types_3.ItemType
                 import com.evolveum.prism.xml.ns._public.types_3.RawType
 
                 import static com.evolveum.midpoint.model.intest.misc.TestTracing.NAME_EMBEDDED
@@ -47,10 +48,9 @@
                 log.info('created PCV:\n{}', rootPcv.debugDump())
                 rootPcv
 
-                idt = new ItemDeltaType()
-                idt.value.add(new RawType(rootPcv, TYPE_MY_CONTAINER, midpoint.prismContext))
-//                idt.value.add(rootPcv)
-                idt
+                item = new ItemType()
+                item.value.add(rootPcv)
+                item
             </code>
         </script>
     </function>

model/model-intest/src/test/resources/tracing/role-class-less-values.xml

@@ -18,9 +18,8 @@
                 <expression>
                     <script>
                         <code>
-                            raw = hacking.execute("createContainerValue", [name: name]).getValue().get(0)
-                            pcv = raw.getParsedValue(null, null) // brutal hack
-                            log.info('value = {}', pcv)
+                            pcv = hacking.execute("createContainerValue", [name: name]).getValue().get(0)
+                            log.info('value = {}', pcv.debugDump())
                             pcv
                         </code>
                     </script>