MID-8147: fix for removing value of container in resource type

Evolveum · Oct 10, 2022 · d348de2 · d348de2
1 parent e37332c
commit d348de2
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 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
@@ -316,6 +316,10 @@ public static boolean isValueFromResourceTemplate(PrismValue valueFromDelta, Pri
     }
 
     private static boolean hasValueMetadata(PrismValue value) {
+        if (value == null) {
+            return false;
+        }
+
         if (value.hasValueMetadata()) {
             List<PrismContainerValue<Containerable>> metadataValues = value.getValueMetadata().getValues();
 

diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/ResourceWrapper.java b/...admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/ResourceWrapper.java
@@ -22,7 +22,7 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 
 import com.google.common.collect.ImmutableMap;
-import org.apache.commons.lang3.StringUtils;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -116,7 +116,7 @@ private Collection<ItemDelta<PrismValue, ItemDefinition>> processModifyDeltas(
                 List<PrismValue> valuesFromTemplate = new ArrayList<>();
                 delta.getValuesToDelete().forEach(v -> {
                     if (WebPrismUtil.isValueFromResourceTemplate(v, getItem())
-                            || WebPrismUtil.isValueFromResourceTemplate(v.getParentContainerValue(), getItem())) {
+                            || WebPrismUtil.isValueFromResourceTemplate(getParentContainerValue(v), getItem())) {
                         LOGGER.warn("Couldn't remove value, because is merged from resource template, value: " + v);
                         valuesFromTemplate.add(v);
                     }
@@ -195,7 +195,7 @@ private ItemDelta<PrismValue, ItemDefinition> processAddOrModifyDelta(
 
     private PrismContainerValue<?> createParentValueForAddDelta(
             PrismContainerValue<?> origParentValue, Item newChildItem, PrismContainerValue<?> valueOfExistingDelta) throws SchemaException {
-        PrismContainerValue<?> parentValue = origParentValue.getParentContainerValue();
+        PrismContainerValue<?> parentValue = getParentContainerValue(origParentValue);
 
         PrismContainer newContainer = null;
         PrismContainerValue newValue = null;
@@ -331,4 +331,19 @@ public Collection<ItemDelta> getDeltas() throws SchemaException {
         }
         return deltas;
     }
+
+    private PrismContainerValue getParentContainerValue(PrismValue v) {
+        PrismContainerValue<?> valueContainer = v.getParentContainerValue();
+        if (valueContainer != null) {
+            return valueContainer;
+        }
+        if (v.getParent() instanceof ItemDelta) {
+            @NotNull ItemPath path = ((ItemDelta) v.getParent()).getPath();
+            Item prismParent = getObject().findItem(path);
+            if (prismParent != null) {
+                return prismParent.getParent();
+            }
+        }
+        return null;
+    }
 }