[midPoint-git] [Evolveum/midpoint] 2b0692: Fix resource query handling in activities

mederly noreply at github.com
Tue Jun 22 16:20:21 CEST 2021


  Branch: refs/heads/feature/task-part-restructuring
  Home:   https://github.com/Evolveum/midpoint
  Commit: 2b06920234649dd593ab6b50c4c6c376dcfb8fb5
      https://github.com/Evolveum/midpoint/commit/2b06920234649dd593ab6b50c4c6c376dcfb8fb5
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2021-06-22 (Tue, 22 Jun 2021)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/task/ActivityStateUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/task/work/ObjectSetUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/task/work/ResourceObjectSetUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-tasks-3.xsd
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelPublicConstants.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/ResourceObjectClassSpecification.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/ResourceSearchSpecification.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/SyncTaskHelper.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/SynchronizationObjectsFilter.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/TargetInfo.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/async/AsyncUpdateActivityExecution.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/ImportActivityExecution.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/imp/ImportFromResourceTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/imp/ImportWorkDefinition.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/recon/DebugReconciliationResultListener.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/recon/DebugReconciliationTaskResultListener.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/recon/OperationCompletionActivityExecution.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/recon/PartialReconciliationActivityExecution.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/recon/ReconciliationActivityExecution.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/recon/ReconciliationActivityHandler.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/recon/ReconciliationResult.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/recon/ReconciliationResultListener.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/recon/ReconciliationTaskHandler.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/recon/ReconciliationTaskResult.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/recon/ReconciliationTaskResultListener.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/recon/RemainingShadowsActivityExecution.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/recon/ResourceReconciliationActivityExecution.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/sync/LiveSyncActivityExecution.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/AbstractModelSearchActivityExecution.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/ShadowCleanupActivityHandler.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/reporting/TestTaskReporting.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestLiveSyncTaskMechanics.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestProgressReporting.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestUuid.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/task/AbstractIterativeActivityExecution.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/task/AbstractSearchIterativeActivityExecution.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/task/RepositoryObjectSetSpecificationImpl.java
    M repo/repo-common/src/test/resources/tasks/activities/task-160-mock-search-iterative.xml
    M repo/repo-common/src/test/resources/tasks/activities/task-170-mock-bucketed.xml
    M repo/repo-common/src/test/resources/tasks/activities/task-180-bucketed-tree.xml
    M repo/repo-common/src/test/resources/tasks/activities/task-300-workers-simple.xml
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/TaskAsserter.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestOrgSync.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestUniversity.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestUnix.java

  Log Message:
  -----------
  Fix resource query handling in activities

1) Introduced queryApplication property (append/replace) to control
how custom object set queries are applied.

2) Correctly implemented query construction for resource objects-based
activities.

Also:
- Simplified property names in [Resource]ObjectSetType.
- Migrated ReconciliationResultListener (for tests) to activities.
- Adapted some tests. Disabled some recon audit asserts, see MID-7110.




More information about the midPoint-svn mailing list