[midPoint-git] [Evolveum/midpoint] 11153c: Fix metadata proc. for chained mappings (almost)

mederly noreply at github.com
Tue Aug 25 17:08:12 CEST 2020


  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 11153cd73055b801b555f76c938d76ae723c142b
      https://github.com/Evolveum/midpoint/commit/11153cd73055b801b555f76c938d76ae723c142b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-08-24 (Mon, 24 Aug 2020)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/MappingSetEvaluation.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestValueMetadata.java
    M model/model-intest/src/test/resources/metadata/provenance-metadata-recording/resource-hr.xml
    M model/model-intest/src/test/resources/metadata/provenance-metadata-recording/template-provenance-metadata-recording.xml
    M model/model-intest/src/test/resources/schema/metadata.xsd
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/ExtensionUpdate.java

  Log Message:
  -----------
  Fix metadata proc. for chained mappings (almost)

There are some extra MD values in minus sets - to be fixed later.

Also: Worked around an issue with storing metadata for multivalued
extension items (see MID-6450).


  Commit: 6cf3188a4b322c55978b87c7abf61c58ab9f0e01
      https://github.com/Evolveum/midpoint/commit/6cf3188a4b322c55978b87c7abf61c58ab9f0e01
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-08-25 (Tue, 25 Aug 2020)

  Changed paths:
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/gui/TestIntegrationObjectWrapperFactory.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/AuditCleanupPerformanceTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/AuditTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/BaseSQLRepoTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/CleanupTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/JdbcSession.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/PageOf.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/SqlQueryContext.java

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


  Commit: 8f3241a44261d3d0893acfd08ea3d544b88ea10d
      https://github.com/Evolveum/midpoint/commit/8f3241a44261d3d0893acfd08ea3d544b88ea10d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-08-25 (Tue, 25 Aug 2020)

  Changed paths:
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/delta/ItemDeltaImpl.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/AbstractMappingImpl.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/MappingTestEvaluator.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingMetadata.java
    A model/model-common/src/test/resources/mapping/mapping-asis-fullname-metadata-range-all.xml
    A model/model-common/src/test/resources/mapping/mapping-asis-fullname-metadata-range.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestValueMetadata.java
    M model/model-intest/src/test/resources/metadata/provenance-metadata-recording/resource-crm.xml
    M model/model-intest/src/test/resources/metadata/provenance-metadata-recording/resource-hr.xml
    M model/model-intest/src/test/resources/metadata/provenance-metadata-recording/template-provenance-metadata-recording.xml
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/ValueSetDefinition.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/evaluator/AbstractExpressionEvaluator.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/AcquisitionMetadataAsserter.java

  Log Message:
  -----------
  Fix processing of minus sets w.r.t. metadata

1) Fixed asIs/path evaluator output minus set metadata: there
should be none.

2) When a mapping puts something into its minus set (by computation),
we restrict the yields to match one(s) corresponding to the mapping.

3) Fixed IDI -> delta set triple conversion: when the same value (with
different metadata) is part of more values-to-delete, the result was
wrong. Now we squash values to add/delete/replace so no duplicates are
there.

4) Renamed ownProvenance set specification to matchingProvenance.


Compare: https://github.com/Evolveum/midpoint/compare/c0008c883fa3...8f3241a44261


More information about the midPoint-svn mailing list