[midPoint-git] [Evolveum/midpoint] 3800f2: Improve activity rules code a bit

mederly noreply at github.com
Fri Oct 24 12:02:33 CEST 2025


  Branch: refs/heads/feature/mid-10412-skip-restart-activity
  Home:   https://github.com/Evolveum/midpoint
  Commit: 3800f2dc9b8556c664d887eb97d8f82a71f6a892
      https://github.com/Evolveum/midpoint/commit/3800f2dc9b8556c664d887eb97d8f82a71f6a892
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2025-10-24 (Fri, 24 Oct 2025)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-tasks-3.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/cleanup/CleanupPartialActivityRun.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/ProcessingScope.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/SyncTaskHelper.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/tasks/TestTaskActivityPolicies.java
    M model/model-intest/src/test/resources/tasks/thresholds/complex/task-reconciliation.xml
    M model/model-intest/src/test/resources/tasks/thresholds/task-composite-noop.xml
    M model/model-intest/src/test/resources/tasks/thresholds/task-non-iterative-restart.xml
    M model/model-intest/src/test/resources/tasks/thresholds/task-restart.xml
    M model/model-intest/src/test/resources/tasks/thresholds/task-simple-noop-restart.xml
    M model/model-intest/src/test/resources/tasks/thresholds/task-skip-restart.xml
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/activity/ClassicReportImportActivityRun.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/activity/DistributedReportExportActivitySupport.java
    A repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/ActivityRunResultStatus.java
    A repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/ActivityThresholdPolicyViolationException.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/ActivityTree.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/ActivityTreeStateOverview.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/EmbeddedActivity.java
    A repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/PolicyViolationContext.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/policy/ActivityPolicyConstraintsEvaluator.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/policy/ActivityPolicyProcessorHelper.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/policy/ActivityPolicyRulesProcessor.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/policy/DurationThresholdEvaluator.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/policy/EvaluatedActivityPolicyRule.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/policy/EvaluatedPolicyReaction.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/policy/IntegerThresholdEvaluator.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/policy/PolicyRulesContext.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/policy/PolicyViolationContextBuilder.java
    A repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/policy/evaluator/ExecutionAttemptsConstraintEvaluator.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/policy/evaluator/NumericConstraintEvaluator.java
    R repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/policy/evaluator/RestartActivityConstraintEvaluator.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/run/AbstractActivityRun.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/run/AbstractCompositeActivityRun.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/run/ActivityRunException.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/run/ActivityRunResult.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/run/DelegatingActivityRun.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/run/DistributingActivityRun.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/run/ErrorState.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/run/IterativeActivityRun.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/run/LocalActivityRun.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/run/SearchBasedActivityRun.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/run/SimulationSupport.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/run/SubtaskHelper.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/run/state/ActivityState.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/run/state/ActivityTreePurger.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/run/state/CurrentActivityState.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/run/task/ActivityBasedTaskRun.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/CaseAsserter.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/ResourceAsserter.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/TaskAsserter.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/UserAsserter.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/prism/PrismObjectAsserter.java
    R repo/task-api/src/main/java/com/evolveum/midpoint/task/api/ActivityThresholdPolicyViolationException.java
    R repo/task-api/src/main/java/com/evolveum/midpoint/task/api/PolicyViolationContext.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskRunResult.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/run/TaskCycleExecutor.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/tasks/SuspendAndDeleteHelper.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/tasks/TaskStateManager.java

  Log Message:
  -----------
  Improve activity rules code a bit

The "restartActivity" constraint was renamed to "executionAttempts".

Minor code readability improvements related to activity policy rules
(MID-10412) were done as well. Most notable ones are:

1. Separated ActivityRunResultStatus from TaskRunResultStatus.
These two have slightly different semantics and are used in different
layers (tasks vs activities).

2. Added TaskRunResult#taskRestartInstruction so that the activity-
related stuff could go back from task-api to repo-common module.

3. Streamlined runResult handling (removing duplication of logic) in
AbstractCompositeActivityRun#executeChildren.

4. Deduplicated the code and added comments at some places.

Work in progress. TestTaskActivityPolicies#test300 started failing.



To unsubscribe from these emails, change your notification settings at https://github.com/Evolveum/midpoint/settings/notifications


More information about the midPoint-svn mailing list