[midPoint-git] [Evolveum/midpoint] cb4a2e: Fix raw mode handling in DeletionActivityHandler

mederly noreply at github.com
Mon Nov 15 18:41:36 CET 2021


  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: cb4a2ebb3bceeef79e7b257be65c6316824e9322
      https://github.com/Evolveum/midpoint/commit/cb4a2ebb3bceeef79e7b257be65c6316824e9322
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2021-11-15 (Mon, 15 Nov 2021)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/abstractrole/component/MemberOperationsHelper.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/GetOperationOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/SelectorOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResult.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/util/GetOperationOptionsUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelExecuteOptions.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelObjectResolver.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/ModelController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ResolveExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/helpers/OperationsHelper.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/tasks/DeletionActivityHandler.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/tasks/TestMiscTasks.java
    A model/model-intest/src/test/resources/tasks/misc/task-delete-incomplete-raw.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/shadows/GetHelper.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/shadows/SearchHelper.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/ProvisioningUtil.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummy.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/run/SearchBasedActivityRunSpecifics.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/run/SearchSpecification.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdap.java

  Log Message:
  -----------
  Fix raw mode handling in DeletionActivityHandler

1. Raw mode is now correctly set: for legacy config the `optionRaw`
is applied to both search and execution options. For modern config there
is no such option, but the default for raw option is `true` at both
places. As a safety check, the "raw" option must be explicitly set
at both places, or at none of them.

2. Search for shadows in provisioning did ignore the raw option
completely. This is now (almost) fixed. See also MID-7419.

3. In addition to this, ModelObjectResolver now handles the raw option
in searchIterative, searchObjects, and countObjects by directly passing
such requests to repo cache, instead of going through provisioning.
This is in line with an earlier fix for MID-6716. (Also, objects
managed by task manager are now handled there correctly.)

Unrelated changes:

- Moved GET-options-related util methods to GetOperationOptionsUtil.
- Added DEBUG-level logging of the start of executeChanges operation.


  Commit: 04575e4cf073541dafabfef6963f90646118ed73
      https://github.com/Evolveum/midpoint/commit/04575e4cf073541dafabfef6963f90646118ed73
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2021-11-15 (Mon, 15 Nov 2021)

  Changed paths:
    M model/report-impl/src/test/java/com/evolveum/midpoint/report/TestCsvReportImportClassic.java
    A model/report-impl/src/test/resources/common/role-end-user.xml

  Log Message:
  -----------
  Fix TestCsvReportImportClassic

The import data references End user role that was originally missing.

This caused WARNING op. result but - unfortunately - the result was
not reported by the task until 8620f6f157cfcafc41f467b56860a985e14a430a.
Only that commit this test began to fail.

So, here we add missing End user role.


  Commit: 7139cbd45a7c5aa89586a364424cae85b0bb7517
      https://github.com/Evolveum/midpoint/commit/7139cbd45a7c5aa89586a364424cae85b0bb7517
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2021-11-15 (Mon, 15 Nov 2021)

  Changed paths:
    M repo/repo-test-util/src/main/resources/test-config-new-repo.xml
    M repo/repo-test-util/src/main/resources/test-config.xml
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/ad/AbstractAdLdapMultidomainTest.java
    A testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/ad/TestAdLdapAd2016.java
    A testing/conntest/src/test/resources/ad-ldap-multidomain/resource-ad2016.xml
    A testing/conntest/src/test/resources/ad-ldap-multidomain/task-reconcile-ad2016-users.xml
    M testing/conntest/src/test/resources/truststore.jks
    M testing/conntest/testng-integration.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


Compare: https://github.com/Evolveum/midpoint/compare/0d8ebcabdf0d...7139cbd45a7c


More information about the midPoint-svn mailing list