[midPoint-git] [Evolveum/midpoint] 3275ff: Fix delta narrowing algorithm (MID-6063)

mederly noreply at github.com
Wed Aug 26 11:08:02 CEST 2020


  Branch: refs/heads/support-4.0
  Home:   https://github.com/Evolveum/midpoint
  Commit: 3275ff571321df9ac64d3719400d2313a1852ac5
      https://github.com/Evolveum/midpoint/commit/3275ff571321df9ac64d3719400d2313a1852ac5
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-08-26 (Wed, 26 Aug 2020)

  Changed paths:
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/delta/ItemDeltaImpl.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseDiffPatch.java
    A infra/schema/src/test/resources/diff/system-configuration-after.xml
    A infra/schema/src/test/resources/diff/system-configuration-before.xml
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyTest.java
    A repo/repo-sql-impl-test/src/test/resources/modify/system-configuration-after.xml
    A repo/repo-sql-impl-test/src/test/resources/modify/system-configuration-before.xml

  Log Message:
  -----------
  Fix delta narrowing algorithm (MID-6063)

Obviously if we add+delete a given value, we cannot narrow it out from
ADD set and keep it in DELETE set.

But beware, there is a lot more to investigate, mainly regarding
equivalence strategies that are used for comparison and delta
application.

(cherry picked from commit 0c19f35abff44b36982f12b6ac30ad393e248f70)


  Commit: 3db9f15aa103f881b02f18bf67de4f43e2394da7
      https://github.com/Evolveum/midpoint/commit/3db9f15aa103f881b02f18bf67de4f43e2394da7
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-08-26 (Wed, 26 Aug 2020)

  Changed paths:
    M infra/schema/src/test/resources/diff/system-configuration-after.xml
    M infra/schema/src/test/resources/diff/system-configuration-before.xml
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyTest.java
    M repo/repo-sql-impl-test/src/test/resources/modify/system-configuration-after.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/system-configuration-before.xml

  Log Message:
  -----------
  Do post-merge fixes

Related to MID-6063.


Compare: https://github.com/Evolveum/midpoint/compare/bf9835b82654...3db9f15aa103


More information about the midPoint-svn mailing list