[midPoint-git] [Evolveum/midpoint] 7d44e9: Prepare scripting/library execution profiles
mederly
noreply at github.com
Fri Aug 4 15:54:31 CEST 2023
Branch: refs/heads/tmp/scripting-profiles
Home: https://github.com/Evolveum/midpoint
Commit: 7d44e91932796ad4b423a25e8a728f193256bd52
https://github.com/Evolveum/midpoint/commit/7d44e91932796ad4b423a25e8a728f193256bd52
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2023-08-04 (Fri, 04 Aug 2023)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/init/PostInitialDataImport.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageBulkAction.java
M infra/common/src/main/java/com/evolveum/midpoint/common/StaticExpressionUtil.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/config/AbstractAssignmentConfigItem.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/config/AbstractPolicyRuleConfigItem.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/config/AssignmentConfigItem.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/config/ConfigurationItem.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/config/ConfigurationItemOrigin.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/config/ConfigurationItemable.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/config/ConstructionConfigItem.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/config/ExecuteScriptConfigItem.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/config/FocalAutoassignSpecificationConfigItem.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/config/GlobalPolicyRuleConfigItem.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/config/InducementConfigItem.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/config/PolicyActionConfigItem.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/config/PolicyRuleConfigItem.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/config/PrivilegesMixin.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/config/ScriptExecutionPolicyActionConfigItem.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/config/package-info.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ObjectTypes.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/expression/AbstractSecurityProfile.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/expression/ExpressionEvaluatorProfile.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/expression/ExpressionEvaluatorsProfile.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/expression/ExpressionPermissionProfile.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/expression/ExpressionProfile.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/expression/FunctionLibrariesProfile.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/expression/FunctionLibraryProfile.java
R infra/schema/src/main/java/com/evolveum/midpoint/schema/expression/ScriptExpressionProfile.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/expression/ScriptLanguageExpressionProfile.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/expression/ScriptingActionProfile.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/expression/ScriptingProfile.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ExecuteScriptUtil.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/PolicyRuleTypeUtil.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ScriptingBeansUtil.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/task/work/WorkDefinitionUtil.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/MidPointTestConstants.java
M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/CertificationHook.java
M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/CertificationManagerImpl.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ActivitySubmissionOptions.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ScriptingService.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/AssociatedPolicyRule.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/ModelElementContext.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/ModelCommonBeans.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/archetypes/ArchetypeManager.java
A model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionProfileManager.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/ScriptExpression.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/ScriptExpressionEvaluationContext.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/ScriptExpressionEvaluatorFactory.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/ScriptExpressionFactory.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/groovy/GroovyScriptEvaluator.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/groovy/SandboxTypeCheckingExtension.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/AbstractMappingBuilder.java
M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/script/AbstractScriptTest.java
M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/script/TestGroovyExpressionsSandbox.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelBeans.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/cleanup/CleanupWorkDefinition.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/cleanup/ShadowRefreshActivityHandler.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/controller/DashboardServiceImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/MappingDiagEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/objects/ObjectIntegrityCheckActivityHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/shadows/ShadowIntegrityCheckWorkDefinition.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ClockworkHookHelper.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/LensElementContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/PolicyRulesContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/AssignmentPathSegmentImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/EvaluatedAssignmentImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/ForeignPolicyRuleImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/PayloadEvaluation.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/TargetsEvaluation.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/construction/ConstructionResourceResolver.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentOrigin.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/PruningOperation.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/PolicyRuleEvaluator.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/PolicyStateRecorder.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/scriptExecutor/ActionContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/scriptExecutor/AsynchronousScriptExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/scriptExecutor/PolicyRuleScriptExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/scriptExecutor/SynchronousScriptExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/ExecutionContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/IterativeScriptingActivityHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/NonIterativeScriptingActivityHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/PipelineData.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/ScriptingExpressionEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/VariablesUtil.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ExecuteScriptExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/expressions/SearchEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/simulation/ProcessedObjectImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/async/AsyncUpdateWorkDefinition.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/imp/ImportWorkDefinition.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/recon/ReconciliationWorkDefinition.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/sync/LiveSyncWorkDefinition.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/DeletionActivityHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/ExplicitChangeExecutionActivityHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/IterativeChangeExecutionActivityHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/RecomputationActivityHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/ReindexActivityHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/ShadowCleanupActivityHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/cluster/AutoScalingWorkDefinition.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/scanner/FocusValidityScanWorkDefinition.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/trigger/TriggerScanWorkDefinition.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/expr/TestModelExpressions.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/AbstractAssignmentEvaluatorTest.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/scripting/AbstractBasicScriptingTest.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/scripting/TestScriptingBasicNew.java
M model/model-intest/src/test/resources/common/archetype-task-single-bulk-action.xml
M model/model-intest/src/test/resources/profiles/system-configuration.xml
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/asserter/ElementContextAsserter.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationHook.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportServiceImpl.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/activity/AbstractReportWorkDefinition.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/activity/ClassicReportExportWorkDefinition.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/activity/ClassicReportImportWorkDefinition.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/activity/DistributedReportExportWorkDefinition.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/controller/ImportController.java
M model/rest-impl/src/main/java/com/evolveum/midpoint/rest/impl/ModelRestController.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/AssignmentPolicyAspectPart.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ProcessSpecifications.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/shadows/task/MultiPropagationWorkDefinition.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/shadows/task/PropagationWorkDefinition.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/ProvisioningUtil.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/SystemObjectCache.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/definition/AbstractWorkDefinition.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/definition/ActivityDefinition.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/definition/CompositeWorkDefinition.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/definition/WorkDefinition.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/definition/WorkDefinitionFactory.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/handlers/ActivityHandlerRegistry.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/handlers/CustomCompositeActivityHandler.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/handlers/NoOpActivityHandler.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/expression/Expression.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/ExpressionProfileCompiler.java
M repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/tasks/handlers/composite/CompositeMockWorkDefinition.java
M repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/tasks/handlers/iterative/IterativeMockWorkDefinition.java
M repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/tasks/handlers/search/SearchIterativeMockWorkDefinition.java
M repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/tasks/handlers/simple/SimpleMockWorkDefinition.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
Log Message:
-----------
Prepare scripting/library execution profiles
This a step towards execution profiles for scripting (bulk actions)
and function libraries, ultimately aimed at resolution of MID-6913
and MID-7831.
1. Expression profiles (both raw beans and their compiled form) were
enriched with the support for bulk actions and function libraries.
2. ScriptingService interface was cleaned up: legacy methods (dealing
with incomplete data) were removed, background execution was changed
to use ModelInteractionService#submit method, and moved to that service
altogether. Finally, the ScriptingService and underlying scripting
evaluator now expects the execution request to be present as a config
item, with the origin set up.
3. EvaluatedPolicyRule (a potential source of bulk actions) was updated
to expect policy rule config item, instead of "raw" policy rule beans.
Also, getEnabledActions and similar methods now returns config items.
That methods were also "hardened" to fail if the rule was not yet
evaluated (preventing from returning nonsense data).
4. Activity work definition (another source of bulk actions) now has
the information on origin as well.
5. ExpressionProfileManager was factored out from ArchetypeManager.
Work in progress. This commit is mainly in order to merge recent
(conflicting) activity-related changes from other branches.
Commit: 18e0e1c2229df6ca6676a981392885f954c13943
https://github.com/Evolveum/midpoint/commit/18e0e1c2229df6ca6676a981392885f954c13943
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2023-08-04 (Fri, 04 Aug 2023)
Changed paths:
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/task/work/WorkDefinitionUtil.java
M infra/schema/src/main/resources/xml/ns/public/common/common-tasks-3.xsd
M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/OperationResultAssert.java
M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/TestUtil.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelBeans.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/cleanup/CleanupActivityHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/cleanup/CleanupWorkDefinition.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/cleanup/ShadowRefreshActivityHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/objects/ObjectIntegrityCheckActivityHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/shadows/ShadowIntegrityCheckActivityHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/shadows/ShadowIntegrityCheckWorkDefinition.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/DeltaExecutionPreprocessor.java
R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/DeltaModifier.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ElementState.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/OperationalDataManager.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/executor/DeltaExecution.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/indexing/IndexingManager.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/tasks/TaskOperationalDataManager.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/IterativeScriptingActivityHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/NonIterativeScriptingActivityHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/async/AsyncUpdateActivityHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/async/AsyncUpdateWorkDefinition.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/imp/ImportActivityHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/imp/ImportWorkDefinition.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/recon/ReconciliationActivityHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/recon/ReconciliationActivityRun.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/recon/ReconciliationWorkDefinition.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/sync/LiveSyncActivityHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/sync/LiveSyncWorkDefinition.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/DeletionActivityHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/ExplicitChangeExecutionActivityHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/IterativeChangeExecutionActivityHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/RecomputationActivityHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/ReindexActivityHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/ShadowCleanupActivityHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/cluster/AutoScalingActivityHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/cluster/AutoScalingWorkDefinition.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/scanner/FocusValidityScanActivityHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/scanner/FocusValidityScanWorkDefinition.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/simple/SimpleActivityHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/trigger/TriggerScanActivityHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/trigger/TriggerScanWorkDefinition.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestRecomputeTask.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/tasks/TestMiscTasks.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/activity/AbstractReportWorkDefinition.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/activity/ClassicReportExportActivityHandler.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/activity/ClassicReportExportWorkDefinition.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/activity/ClassicReportImportActivityHandler.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/activity/ClassicReportImportWorkDefinition.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/activity/DistributedReportExportActivityHandler.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/activity/DistributedReportExportWorkDefinition.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/shadows/task/MultiPropagationActivityHandler.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/shadows/task/MultiPropagationWorkDefinition.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/shadows/task/PropagationActivityHandler.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/shadows/task/PropagationWorkDefinition.java
M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnIdNameMapper.java
M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorInstanceConnIdImpl.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/TaskActivityManager.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/definition/AbstractWorkDefinition.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/definition/ActivityDefinition.java
A repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/definition/ActivityTypeNameAware.java
A repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/definition/AffectedObjectsProvider.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/definition/CompositeWorkDefinition.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/definition/ObjectSetSpecificationProvider.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/definition/ResourceObjectSetSpecificationProvider.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/definition/WorkDefinition.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/definition/WorkDefinitionFactory.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/handlers/ActivityHandlerRegistry.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/handlers/NoOpActivityHandler.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/run/reports/InternalOperationsReport.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/run/task/ActivityBasedTaskHandler.java
M repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/tasks/handlers/composite/CompositeMockActivityHandler.java
M repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/tasks/handlers/composite/CompositeMockWorkDefinition.java
M repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/tasks/handlers/iterative/IterativeMockActivityHandler.java
M repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/tasks/handlers/iterative/IterativeMockWorkDefinition.java
M repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/tasks/handlers/search/SearchIterativeMockActivityHandler.java
M repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/tasks/handlers/search/SearchIterativeMockWorkDefinition.java
M repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/tasks/handlers/simple/SimpleMockActivityHandler.java
M repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/tasks/handlers/simple/SimpleMockWorkDefinition.java
M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/task/QTaskMapping.java
M repo/repo-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/func/SqaleRepoSearchTest.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/TaskAsserter.java
Log Message:
-----------
Merge branch 'tmp/affected-objects' into tmp/scripting-profiles
# Conflicts:
# model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/cleanup/CleanupWorkDefinition.java
# model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/cleanup/ShadowRefreshActivityHandler.java
# model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/objects/ObjectIntegrityCheckActivityHandler.java
# model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/shadows/ShadowIntegrityCheckWorkDefinition.java
# model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/IterativeScriptingActivityHandler.java
# model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/NonIterativeScriptingActivityHandler.java
# model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/async/AsyncUpdateWorkDefinition.java
# model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/imp/ImportWorkDefinition.java
# model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/recon/ReconciliationWorkDefinition.java
# model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/sync/LiveSyncWorkDefinition.java
# model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/DeletionActivityHandler.java
# model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/ExplicitChangeExecutionActivityHandler.java
# model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/IterativeChangeExecutionActivityHandler.java
# model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/RecomputationActivityHandler.java
# model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/ReindexActivityHandler.java
# model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/ShadowCleanupActivityHandler.java
# model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/cluster/AutoScalingWorkDefinition.java
# model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/scanner/FocusValidityScanWorkDefinition.java
# model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/trigger/TriggerScanWorkDefinition.java
# model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/activity/AbstractReportWorkDefinition.java
# model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/activity/ClassicReportExportWorkDefinition.java
# model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/activity/ClassicReportImportWorkDefinition.java
# model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/activity/DistributedReportExportWorkDefinition.java
# provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/shadows/task/MultiPropagationWorkDefinition.java
# provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/shadows/task/PropagationWorkDefinition.java
# repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/definition/AbstractWorkDefinition.java
# repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/definition/ActivityDefinition.java
# repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/definition/CompositeWorkDefinition.java
# repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/definition/WorkDefinition.java
# repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/definition/WorkDefinitionFactory.java
# repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/handlers/ActivityHandlerRegistry.java
# repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/handlers/NoOpActivityHandler.java
# repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/tasks/handlers/composite/CompositeMockWorkDefinition.java
# repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/tasks/handlers/iterative/IterativeMockWorkDefinition.java
# repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/tasks/handlers/search/SearchIterativeMockWorkDefinition.java
# repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/tasks/handlers/simple/SimpleMockWorkDefinition.java
Commit: 300910b750109e12ae7c0f9d783623b90e66fa88
https://github.com/Evolveum/midpoint/commit/300910b750109e12ae7c0f9d783623b90e66fa88
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2023-08-04 (Fri, 04 Aug 2023)
Changed paths:
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/cleanup/CleanupWorkDefinition.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/cleanup/ShadowRefreshActivityHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/objects/ObjectIntegrityCheckActivityHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/shadows/ShadowIntegrityCheckWorkDefinition.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/IterativeScriptingActivityHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/NonIterativeScriptingActivityHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/async/AsyncUpdateWorkDefinition.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/imp/ImportWorkDefinition.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/recon/ReconciliationWorkDefinition.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/sync/LiveSyncWorkDefinition.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/DeletionActivityHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/ExplicitChangeExecutionActivityHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/IterativeChangeExecutionActivityHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/RecomputationActivityHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/ReindexActivityHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/ShadowCleanupActivityHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/cluster/AutoScalingWorkDefinition.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/scanner/FocusValidityScanWorkDefinition.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/trigger/TriggerScanWorkDefinition.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/activity/AbstractReportWorkDefinition.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/activity/ClassicReportExportWorkDefinition.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/activity/ClassicReportImportWorkDefinition.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/activity/DistributedReportExportWorkDefinition.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/shadows/task/MultiPropagationWorkDefinition.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/shadows/task/PropagationWorkDefinition.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/TaskActivityManager.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/definition/AbstractWorkDefinition.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/definition/ActivityDefinition.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/definition/CompositeWorkDefinition.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/definition/WorkDefinition.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/definition/WorkDefinitionFactory.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/handlers/ActivityHandlerRegistry.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/handlers/NoOpActivityHandler.java
M repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/tasks/handlers/composite/CompositeMockWorkDefinition.java
M repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/tasks/handlers/iterative/IterativeMockWorkDefinition.java
M repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/tasks/handlers/search/SearchIterativeMockWorkDefinition.java
M repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/tasks/handlers/simple/SimpleMockWorkDefinition.java
Log Message:
-----------
Resolve merge conflicts
These were because of "affected objects" vs. "origin-aware" features
conflict.
Compare: https://github.com/Evolveum/midpoint/compare/7d44e9193279%5E...300910b75010
More information about the midPoint-svn
mailing list