[midPoint-git] [Evolveum/midpoint] ad80dd: Merge branch 'master' into feature/focus-activity-...
mederly
noreply at github.com
Wed Apr 22 00:15:36 CEST 2026
Branch: refs/heads/feature/focus-activity-policies
Home: https://github.com/Evolveum/midpoint
Commit: ad80dd4359d8be0884b044daf2a120b3e8198d92
https://github.com/Evolveum/midpoint/commit/ad80dd4359d8be0884b044daf2a120b3e8198d92
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2026-04-21 (Tue, 21 Apr 2026)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/StatusAwareContainerListPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/data/provider/suggestion/StatusAwareDataProvider.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/input/expression/ExpressionPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/AssociationTablePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/SchemaHandlingObjectsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/wizard/schemaHandling/objectType/attribute/mapping/SmartMappingTable.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/wizard/schemaHandling/objectType/correlation/SmartCorrelationTable.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/util/StatusInfoTableUtil.java
Log Message:
-----------
Merge branch 'master' into feature/focus-activity-policies
Commit: c20d67b79d16b001d885d33a1f0c73d6513bb3a4
https://github.com/Evolveum/midpoint/commit/c20d67b79d16b001d885d33a1f0c73d6513bb3a4
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2026-04-22 (Wed, 22 Apr 2026)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/data/column/PrismContainerWrapperColumnPanel.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/policy/PolicyConstraintKind.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/policy/PolicyRuleApplicabilityUtil.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/policy/PolicyRuleDumpUtil.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/AssignmentUtil.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/PolicyRuleTypeUtil.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAlwaysTrueTrigger.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedCollectionStatsTrigger.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedCompositeTrigger.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedCustomConstraintTrigger.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedExclusionRequirementTrigger.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedExclusionTrigger.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedFocusPolicyRuleTrigger.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedHasAssignmentTrigger.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedModificationTrigger.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedMultiplicityTrigger.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedOrphanedTrigger.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRule.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedRequirementTrigger.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedSituationTrigger.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedStateTrigger.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedTimeValidityTrigger.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedTransitionTrigger.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/PredefinedPolicySituation.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/CollectionProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedPolicyRuleImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/PolicyRulesCollector.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/AlwaysTrueConstraintEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/AssignmentModificationConstraintEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/CompositeConstraintEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/CustomConstraintEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/ExclusionRequirementConstraintEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/HasAssignmentConstraintEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/MultiplicityConstraintEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/OrphanedConstraintEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/PolicyConstraintsEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/StateConstraintEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/TransitionConstraintEvaluator.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/policy/ActivityCompositeTrigger.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/EvaluatedActivityPolicyRuleTrigger.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/policy/EvaluatedDurationTrigger.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/policy/EvaluatedItemProcessingResultTrigger.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/policy/EvaluatedNumericTrigger.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/policy/EvaluatedPolicyRuleTrigger.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/policy/evaluator/ActivityCompositeConstraintEvaluator.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/policy/evaluator/DurationConstraintEvaluator.java
M 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/ExecutionTimeConstraintEvaluator.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/policy/evaluator/NumericConstraintEvaluator.java
Log Message:
-----------
Cleanup PolicyRuleTypeUtil
What
This commit factors out PolicyRuleTypeUtil to smaller components, namely
PolicyRuleDumpUtil and RuleApplicabilityUtil. It also formalizes the
concept of PolicyConstraintKind, creating a single place where various
aspects of these constraints are defined. This concept is now used also
when creating triggers.
Why
The existing code was very tangled, especially when dealing with rule
applicability determination. Now it should be much clearer. It is
important especially because implementation of activity-bound rules
is in progress.
Related to MID-11051.
Commit: ae22b4ac73952973948cfb13041f2f46cde31832
https://github.com/Evolveum/midpoint/commit/ae22b4ac73952973948cfb13041f2f46cde31832
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2026-04-22 (Wed, 22 Apr 2026)
Changed paths:
M gui/admin-gui/src/frontend/scss/_tiles.scss
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/tile/WizardGuideTilePanel.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/util/EvaluatedPolicyRuleUtil.java
M model/model-common/src/test/resources/expression/mel/expression-objectref-variables.xml
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/GenericPolicyRuleIdentifier.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/PolicyRulesCollector.java
M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/ActivityPolicyRuleEvent.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/policy/PolicyRuleCounterUpdater.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/policy/PolicyRuleIdentifier.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/policy/GenericEvaluatedPolicyRule.java
Log Message:
-----------
Merge remote-tracking branch 'origin/feature/focus-activity-policies' into feature/focus-activity-policies
# Conflicts:
# infra/schema/src/main/java/com/evolveum/midpoint/schema/util/PolicyRuleTypeUtil.java
Compare: https://github.com/Evolveum/midpoint/compare/409eb9bdc1e0...ae22b4ac7395
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