Merge remote-tracking branch 'origin/master'

Evolveum · Mar 21, 2023 · 6d9b2d2 · 6d9b2d2
2 parents f62206c + 0b26e13
commit 6d9b2d2
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 2 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebPrismUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebPrismUtil.java
@@ -14,6 +14,7 @@
 import com.evolveum.midpoint.schema.processor.*;
 import com.evolveum.midpoint.util.DisplayableValue;
 import com.evolveum.midpoint.util.QNameUtil;
+import com.evolveum.midpoint.web.util.ExpressionUtil;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 
 import com.evolveum.prism.xml.ns._public.types_3.ItemPathType;
@@ -251,7 +252,15 @@ private static <T> void cleanupEmptyValues(Item item) {
             Iterator<PrismPropertyValue<T>> iterator = pVals.iterator();
             while (iterator.hasNext()) {
                 PrismPropertyValue<T> pVal = iterator.next();
-                if (pVal == null || pVal.isEmpty() || pVal.getRealValue() == null) {
+                if (pVal == null) {
+                    iterator.remove();
+                    continue;
+                }
+                if (pVal.getRealValue() instanceof ExpressionType && ExpressionUtil.isEmpty((ExpressionType)pVal.getRealValue())) {
+                    iterator.remove();
+                    continue;
+                }
+                if (pVal.isEmpty() || pVal.getRealValue() == null) {
                     iterator.remove();
                 }
             }

diff --git a/...min-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/ExpressionWrapper.java b/...min-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/ExpressionWrapper.java
@@ -8,6 +8,13 @@
 
 import javax.xml.namespace.QName;
 
+import com.evolveum.midpoint.prism.ItemDefinition;
+import com.evolveum.midpoint.prism.PrismValue;
+import com.evolveum.midpoint.prism.delta.ItemDelta;
+import com.evolveum.midpoint.util.exception.SchemaException;
+
+import com.evolveum.midpoint.web.util.ExpressionUtil;
+
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -16,6 +23,8 @@
 import com.evolveum.midpoint.prism.PrismProperty;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 
+import java.util.Collection;
+
 /**
  * Created by honchar
  */
@@ -133,4 +142,12 @@ public Integer getDisplayOrder() {
     public @NotNull QName getTypeName() {
         return CUSTOM_Q_NAME;
     }
+
+    @Override
+    protected <D extends ItemDelta<? extends PrismValue, ? extends ItemDefinition>> void addValueToDelta(
+            PrismPropertyValueWrapper<ExpressionType> value, D delta) throws SchemaException {
+        if (!ExpressionUtil.isEmpty(value.getRealValue())) {
+            super.addValueToDelta(value, delta);
+        }
+    }
 }
diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/ItemWrapperImpl.java b/...admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/ItemWrapperImpl.java
@@ -104,7 +104,7 @@ public ItemWrapperImpl(PrismContainerValueWrapper<?> parent, I item, ItemStatus
         }
 
         for (VW value : values) {
-            value.addToDelta(delta);
+            addValueToDelta(value, delta);
         }
 
         if (delta.isEmpty()) {
@@ -116,6 +116,11 @@ public ItemWrapperImpl(PrismContainerValueWrapper<?> parent, I item, ItemStatus
         return MiscUtil.createCollection(delta);
     }
 
+    protected  <D extends ItemDelta<? extends PrismValue, ? extends ItemDefinition>> void addValueToDelta(VW value, D delta)
+            throws SchemaException {
+        value.addToDelta(delta);
+    }
+
     @Override
     public String getDisplayName() {
         if (displayName == null) {