[midPoint-git] [Evolveum/midpoint] 0de950: Fix duplicate name delta during shadow refresh

mederly noreply at github.com
Thu Jul 7 16:19:21 CEST 2022


  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 0de9509050016c7183d18b686f986ac6d865ed89
      https://github.com/Evolveum/midpoint/commit/0de9509050016c7183d18b686f986ac6d865ed89
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2022-07-07 (Thu, 07 Jul 2022)

  Changed paths:
    M infra/common/src/test/java/com/evolveum/midpoint/common/refinery/TestRefinedSchema.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceObjectDefinitionResolver.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceSchemaTestUtil.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/AbstractSecurityTest.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/shadows/RefreshHelper.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/shadows/manager/ShadowManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/shadows/manager/ShadowUpdater.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/AbstractBasicDummyTest.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyExtra.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/manual/AbstractManualResourceTest.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDj.java
    A provisioning/provisioning-impl/src/test/resources/manual/account-black.xml
    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/DummyResourceContoller.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/refinedschema/RefinedResourceSchemaAsserter.java

  Log Message:
  -----------
  Fix duplicate name delta during shadow refresh

Delta for $shadow/name was created twice: first in
RefreshHelper#refreshShadowAsyncStatus, and then in
ShadowUpdater#extractRepoShadowChanges. This caused the consistency
checks in repository to fail.

The latter method was adapted to allow only single `name` delta
to pass through.

This should resolve MID-7985 and MID-7924.

Unrelated change: The legacy/ugly findDefaultOrAnyObjectTypeDefinition
method in ResourceSchemaTestUtil have been deleted and its uses have
been replaced by calls to ResourceSchema#findDefaultDefinitionForKind.


  Commit: 934dd9340b7ae2c34abf52dab4835f5bdb15d405
      https://github.com/Evolveum/midpoint/commit/934dd9340b7ae2c34abf52dab4835f5bdb15d405
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2022-07-07 (Thu, 07 Jul 2022)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/wizard/BasicWizardPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/SearchPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/wizard/ObjectClassDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/wizard/SelectObjectClassesStepPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/wizard/SelectObjectClassesStepPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/vertical/form/VerticalFormPrismContainerPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/SelectableListDataProvider.java

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


Compare: https://github.com/Evolveum/midpoint/compare/e77e7023f059...934dd9340b7a


More information about the midPoint-svn mailing list