Fix focus deletion simulation

The simulated "objectNew" computation was wrong. Also, fixed displaying of policy rule evaluation in the trace viewer.
Evolveum · Feb 14, 2023 · f59add7 · f59add7
1 parent 073addd
commit f59add7
Show file tree

Hide file tree

Showing 5 changed files with 188 additions and 98 deletions.
diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/traces/OpType.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/traces/OpType.java
@@ -76,8 +76,11 @@ public enum OpType {
             "Focus policy rules ${m:getFocusPolicyRulesInfo}"),
 
     POLICY_RULE_EVALUATION(OperationKindType.OTHER, "Policy rule evaluation",
-            "com.evolveum.midpoint.model.impl.lens.projector.policy.PolicyRuleProcessor.evaluateRule",
-            "Rule evaluation: ${m:getRuleInfo}"),
+            (a) -> true,
+            List.of(
+                    "com.evolveum.midpoint.model.impl.lens.projector.policy.PolicyRuleProcessor.evaluateRule",
+                    "com.evolveum.midpoint.model.impl.lens.projector.policy.PolicyRuleEvaluator.evaluateRule"),
+            "Rule evaluation: ${m:getRuleInfo}"), // PolicyRuleEvaluationOpNode
 
     POLICY_CONSTRAINT_EVALUATION(OperationKindType.OTHER, "Policy constraint evaluation",
             "com.evolveum.midpoint.model.impl.lens.projector.policy.evaluators.*ConstraintEvaluator.evaluate",

diff --git a/...model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java b/...model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java
@@ -497,12 +497,18 @@ private void ensureActivationInformationAvailable(LensProjectionContext projCtx)
 
     @Override
     public boolean isFocusActivated() {
-        return !wasFocusActive() && willFocusBeActive();
+        boolean wasActive = wasFocusActive();
+        boolean willBeActive = willFocusBeActive();
+        LOGGER.trace("isFocusActivated: wasActive = {}, willBeActive = {}", wasActive, willBeActive);
+        return !wasActive && willBeActive;
     }
 
     @Override
     public boolean isFocusDeactivated() {
-        return wasFocusActive() && !willFocusBeActive();
+        boolean wasActive = wasFocusActive();
+        boolean willBeActive = willFocusBeActive();
+        LOGGER.trace("isFocusDeactivated: wasActive = {}, willBeActive = {}", wasActive, willBeActive);
+        return wasActive && !willBeActive;
     }
 
     private boolean wasFocusActive() {

diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ElementState.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ElementState.java
@@ -727,32 +727,36 @@ void updateAfterExecution(@NotNull TaskExecutionMode taskExecutionMode, int exec
         archivedSecondaryDeltas.add(executionWave, secondaryDelta);
 
         if (!taskExecutionMode.isFullyPersistent()) {
-            // FIXME temporary code
-            if (currentObject == null && isAdd(primaryDelta)) {
-                currentObject = primaryDelta.getObjectToAdd().clone();
-            }
-            if (currentObject == null) {
-                if (isAdd(currentDelta)) {
-                    currentObject = currentDelta.getObjectToAdd();
-                } else if (currentDelta != null) {
-                    LOGGER.warn("No current object and current delta is not add? Ignoring:\n{}", currentDelta.debugDump());
-                }
+            updateInSimulation();
+        }
+
+        clearSecondaryDelta();
+    }
+
+    private void updateInSimulation() throws SchemaException {
+        if (currentObject == null && isAdd(primaryDelta)) {
+            currentObject = primaryDelta.getObjectToAdd().clone();
+        }
+        if (currentObject == null) {
+            if (isAdd(currentDelta)) {
+                currentObject = currentDelta.getObjectToAdd();
             } else if (currentDelta != null) {
-                if (currentDelta.isAdd()) {
-                    LOGGER.warn("Current object exists and current delta is ADD? Ignoring. Object:\n{}\nDelta:\n{}",
-                            currentObject.debugDump(1), currentDelta.debugDump(1));
-                } else if (currentDelta.isDelete()) {
-                    LOGGER.debug("Ignoring application of DELETE delta in simulation mode: {}", currentDelta);
-                } else {
-                    currentDelta.applyTo(currentObject);
-                }
+                LOGGER.warn("No current object and current delta is not add? Ignoring:\n{}", currentDelta.debugDump());
             }
-            if (currentObject != null) {
-                generateMissingContainerIds(currentObject);
+        } else if (currentDelta != null) {
+            if (currentDelta.isAdd()) {
+                LOGGER.warn("Current object exists and current delta is ADD? Ignoring. Object:\n{}\nDelta:\n{}",
+                        currentObject.debugDump(1), currentDelta.debugDump(1));
+            } else if (currentDelta.isDelete()) {
+                LOGGER.debug("Ignoring application of DELETE delta in simulation mode: {}", currentDelta);
+                currentObject = null;
+            } else {
+                currentDelta.applyTo(currentObject);
             }
         }
-
-        clearSecondaryDelta();
+        if (currentObject != null) {
+            generateMissingContainerIds(currentObject);
+        }
     }
 
     private void generateMissingContainerIds(PrismObject<O> currentObject) throws SchemaException {

diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensFocusContext.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensFocusContext.java
@@ -56,6 +56,8 @@ public class LensFocusContext<O extends ObjectType> extends LensElementContext<O
      * (Note we do not currently provide this kind of flag on the projection contexts, because of not being
      * sure if deleted projection cannot be somehow "resurrected" during the processing. For focal objects nothing like
      * this should happen.)
+     *
+     * Used to clarify context (re)loading for deleted focus situations. See MID-4856.
      */
     protected boolean deleted;