commit 0dc788725aff2651a4abd9471d7049db476a5a89
author Francesco Chicchiriccò <ilgrosso@apache.org> Tue Jun 28 16:08:35 2022 +0200
committer Francesco Chicchiriccò <ilgrosso@apache.org> Tue Jun 28 16:10:39 2022 +0200
tree b1da86e22d463c89d1e74a622b6cbb6a4f484479
parent 637d752a1269ebf06edac6aa1e7892fa75103643

[SYNCOPE-1685] Better polymorphic value management

core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/JEXLItemTransformerImpl.java

diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/JEXLItemTransformerImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/JEXLItemTransformerImpl.java
index 8e3e82a..cb4c2b1 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/JEXLItemTransformerImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/JEXLItemTransformerImpl.java
@@ -60,14 +60,47 @@
         this.pullJEXL = pullJEXL;
     }
 
-    protected AttrSchemaType beforePropagation(final PlainAttrValue value, final Any<?> any) {
+    protected AttrSchemaType beforePropagation(
+            final Any<?> any,
+            final AttrSchemaType schemaType,
+            final PlainAttrValue value) {
+
         JexlContext jexlContext = new MapContext();
         if (any != null) {
             JexlUtils.addFieldsToContext(any, jexlContext);
             JexlUtils.addPlainAttrsToContext(any.getPlainAttrs(), jexlContext);
             JexlUtils.addDerAttrsToContext(any, derAttrHandler, jexlContext);
         }
-        jexlContext.set("value", value.getValue());
+
+        Object oValue;
+        switch (schemaType) {
+            case Binary:
+            case Encrypted:
+                oValue = value.getBinaryValue();
+                break;
+
+            case Boolean:
+                oValue = value.getBooleanValue();
+                break;
+
+            case Date:
+                oValue = value.getDateValue();
+                break;
+
+            case Double:
+                oValue = value.getDoubleValue();
+                break;
+
+            case Long:
+                oValue = value.getLongValue();
+                break;
+
+            case Enum:
+            case String:
+            default:
+                oValue = value.getStringValue();
+        }
+        jexlContext.set("value", oValue);
 
         Object tValue = JexlUtils.evaluate(propagationJEXL, jexlContext);
 
@@ -123,10 +156,10 @@
         AtomicReference<AttrSchemaType> tType = new AtomicReference<>();
         if (values.isEmpty()) {
             PlainAttrValue value = anyUtilsFactory.getInstance(any).newPlainAttrValue();
-            tType.set(beforePropagation(value, any));
+            tType.set(beforePropagation(any, schemaType, value));
             values.add(value);
         } else {
-            values.forEach(value -> tType.set(beforePropagation(value, any)));
+            values.forEach(value -> tType.set(beforePropagation(any, schemaType, value)));
         }
 
         return Pair.of(tType.get(), values);