[midPoint-git] [Evolveum/midpoint] 109565: Ignore correlation state if correlation is over

mederly noreply at github.com
Thu Oct 13 18:15:47 CEST 2022


  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 109565d9acaa44a04aac0ff49a7e2ce6958e7fa8
      https://github.com/Evolveum/midpoint/commit/109565d9acaa44a04aac0ff49a7e2ce6958e7fa8
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2022-10-13 (Thu, 13 Oct 2022)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-provisioning-3.xsd
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/correlation/CorrelationService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/correlation/CorrelationCaseManager.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/CorrelationProcessing.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ShadowUpdater.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationContext.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/sync/TestSynchronizationService.java

  Log Message:
  -----------
  Ignore correlation state if correlation is over

In order to support asynchronous correlation, the correlation state was
introduced into shadows in 4.5. This state was used e.g. to continue in
the correlation process after the respective correlation case was
resolved.

However, as a side effect, the correlation on a given shadow was never
re-attempted: subsequent correlation processed provided always the
stored result.

This is now fixed:

1. On correlation re-attempt, the state is ignored (and cleared) if
the previous correlation was already ended.

2. On correlation case resolution, we no longer mark the whole
correlation as ended. It is marked as such only after the actual
correlation is run (following the case completion), taking the results
from the case into account.

This should resolve MID-8223.


  Commit: a13750452a7d903ba3a52d531f6bc8d36f16cce0
      https://github.com/Evolveum/midpoint/commit/a13750452a7d903ba3a52d531f6bc8d36f16cce0
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2022-10-13 (Thu, 13 Oct 2022)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/prism/wrapper/ItemWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/prism/wrapper/PrismValueWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/IndirectSearchItemPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/RelationSearchItemPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/SearchFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/SearchPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/SearchPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/AssociationAttributePanelFactory.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/QNameAttributePanelFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/abstractrole/component/AbstractRoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/task/component/TaskWorkPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/dashboard/PageSelfDashboard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/RequestAccess.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ShoppingCartEditPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/vertical/form/VerticalFormDefaultContainerablePanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/vertical/form/VerticalFormPasswordPropertyPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/vertical/form/VerticalFormPasswordPropertyPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/ItemWrapperImpl.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/PrismValueWrapperImpl.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/ValueMetadataWrapperImpl.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/MultivalueContainerListDataProvider.java
    M gui/admin-gui/src/main/resources/initial-objects/000-system-configuration.xml
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-gui-3.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/GuiProfileCompiler.java

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


Compare: https://github.com/Evolveum/midpoint/compare/b90c203ea171...a13750452a7d


More information about the midPoint-svn mailing list