[midPoint-git] [Evolveum/midpoint] 22e2d8: Check for conflicts for single-valued item

[mederly]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 22e2d8429e269e4c54b19c3e2df153b9fbfd1437
      https://github.com/Evolveum/midpoint/commit/22e2d8429e269e4c54b19c3e2df153b9fbfd1437
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2024-08-06 (Tue, 06 Aug 2024)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/IvwoConsolidator.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestInbounds.java
    A model/model-intest/src/test/resources/inbounds/resource-dummy-inbounds.xml

  Log Message:
  -----------
  Check for conflicts for single-valued item

As described in MID-9621, sometimes it is not enough to check
the conflicts (multivalue to single-valued items) using the computed
delta alone. The reason is that the existing value may not get into
the delta.

This commit adds a functionality to check this explicitly while
consolidating.

It can present a non-compatible change for some environments; but
definitely it's bugfix.


  Commit: e7f07c4499c4167932a39b44696d0e63d6f5e0ba
      https://github.com/Evolveum/midpoint/commit/e7f07c4499c4167932a39b44696d0e63d6f5e0ba
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2024-08-06 (Tue, 06 Aug 2024)

  Changed paths:
    R model/model-impl/src/test/resources/correlator/correlation/users-matching-rules.xml
    M model/model-impl/src/test/resources/correlator/correlation/users-smart-basic.xml

  Log Message:
  -----------
  Fix TestCorrelators

TestCorrelators was not quite correct, and it started to fail after
22e2d8429e269e4c54b19c3e2df153b9fbfd1437 strengthened some checks.

This fixes the test.


  Commit: 79afc07eec75f39435b2d9d82361d7be57d6d14d
      https://github.com/Evolveum/midpoint/commit/79afc07eec75f39435b2d9d82361d7be57d6d14d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2024-08-06 (Tue, 06 Aug 2024)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/NormalizationAwareResourceAttributeDefinition.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/correlation/AbstractMediumIdMatchCorrelationTest.java
    M testing/story/src/test/resources/correlation/idmatch/medium/object-template-user.xml

  Log Message:
  -----------
  Fix AbstractMediumIdMatchCorrelationTest

(There was a typo in the test.)

Plus, added Serializable to normalization aware definition.


  Commit: 7e5ebff476d46a3d7c58073c49ae796e6253ed91
      https://github.com/Evolveum/midpoint/commit/7e5ebff476d46a3d7c58073c49ae796e6253ed91
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2024-08-07 (Wed, 07 Aug 2024)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
    M model/model-intest/src/test/resources/sync/resource-dummy-azure.xml
    M model/model-intest/src/test/resources/sync/task-reconcile-dummy-azure.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

  Log Message:
  -----------
  Adapt TestImportRecon

After implementing 22e2d8429e269e4c54b19c3e2df153b9fbfd1437,
midPoint checks for multi->single mapping output consistency
in fixed (stricter) way.

The TestImportRecon has to be fixed/adapted/hacked to pass.


  Commit: 83c1aa139dbebe375c6ad9799b39c68cc1531e50
      https://github.com/Evolveum/midpoint/commit/83c1aa139dbebe375c6ad9799b39c68cc1531e50
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2024-08-07 (Wed, 07 Aug 2024)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/NormalizationAwareResourceAttributeDefinition.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/IvwoConsolidator.java
    R model/model-impl/src/test/resources/correlator/correlation/users-matching-rules.xml
    M model/model-impl/src/test/resources/correlator/correlation/users-smart-basic.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestInbounds.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
    A model/model-intest/src/test/resources/inbounds/resource-dummy-inbounds.xml
    M model/model-intest/src/test/resources/sync/resource-dummy-azure.xml
    M model/model-intest/src/test/resources/sync/task-reconcile-dummy-azure.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/correlation/AbstractMediumIdMatchCorrelationTest.java
    M testing/story/src/test/resources/correlation/idmatch/medium/object-template-user.xml

  Log Message:
  -----------
  Merge branch 'refs/heads/tmp/mid-9621'


Compare: https://github.com/Evolveum/midpoint/compare/9c285062bc21...83c1aa139dbe

To unsubscribe from these emails, change your notification settings at https://github.com/Evolveum/midpoint/settings/notifications