[midPoint-git] [Evolveum/midpoint] a54a80: Consider different container IDs during comparison

Thu Jan 3 13:22:41 CET 2019

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: a54a800038b51eff6353db4916a162766815bd77
      https://github.com/Evolveum/midpoint/commit/a54a800038b51eff6353db4916a162766815bd77
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-12-22 (Sat, 22 Dec 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PropertyOrReferenceWrapper.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/ResourceObjectPattern.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/Item.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismContainer.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismValueUtil.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/equivalence/EquivalenceStrategy.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/equivalence/ParameterizedEquivalenceStrategy.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/ItemImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContainerImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContainerValueImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismObjectImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismReferenceValueImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismValueImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/delta/ItemDeltaImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/delta/ObjectDeltaImpl.java
    M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java
    M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestCompare.java
    M infra/prism-impl/src/test/resources/common/json/user-jack.json
    A infra/prism-impl/src/test/resources/common/xml/ref-with-filter-different-path.xml
    A infra/prism-impl/src/test/resources/common/xml/ref-with-filter-no-oid.xml
    A infra/prism-impl/src/test/resources/common/xml/ref-with-filter.xml
    A infra/prism-impl/src/test/resources/common/xml/ref-without-filter.xml
    M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/ShadowIntegrityCheckResultHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/ObjectTemplateProcessor.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

  Log Message:
  -----------
  Consider different container IDs during comparison

Different non-null container IDs now cause some equality comparisons
to fail. This changes behavior e.g. for the default diff(..) method.

Other minor changes are e.g.:
- valuesExactMatch -> valuesEqual
- setting parent to zero when clearing/replacing values
- cleanup of containsEquivalentValue method

  Commit: 0fd0d094b3841df9aa8322b7840949a1d6fa1eb7
      https://github.com/Evolveum/midpoint/commit/0fd0d094b3841df9aa8322b7840949a1d6fa1eb7
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-12-22 (Sat, 22 Dec 2018)

  Changed paths:
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/Item.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/delta/ItemDeltaCollectionsUtil.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/ItemImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/delta/ItemDeltaImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/delta/ObjectDeltaImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/IvwoConsolidator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/visualizer/Visualizer.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor.java
    M model/model-impl/src/test/resources/lens/user-barbossa-modify-delete-assignment-account-dummy-attr.xml

  Log Message:
  -----------
  Add equivalence strategy to delta application

Also changed the default for adding values from REAL_VALUE
to IGNORE_METADATA_CONSIDER_DIFFERENT_IDS i.e. the changes are:
- different non-null PCV IDs make values inequal
- different element names make values inequal (this is to be rethought).

The strategy is now in sync with the default strategy used for diff(..).

  Commit: 5615fb032014332ea6eb626d1e64da54b6eea9ac
      https://github.com/Evolveum/midpoint/commit/5615fb032014332ea6eb626d1e64da54b6eea9ac
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-12-24 (Mon, 24 Dec 2018)

  Changed paths:
    M build-system/pom.xml

  Log Message:
  -----------
  Make Oracle tests work on jenkins

(configured classpath for Oracle JDBC driver for surefire plugin)

  Commit: 7d91e8c277ca024ae0f0639d1cd7f13d206d02bf
      https://github.com/Evolveum/midpoint/commit/7d91e8c277ca024ae0f0639d1cd7f13d206d02bf
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-12-24 (Mon, 24 Dec 2018)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/src/main/resources/static/less/midpoint-theme.less
    M tools/test-ng/src/main/java/com/evolveum/midpoint/tools/testng/Retry.java
    M tools/test-ng/src/main/java/com/evolveum/midpoint/tools/testng/TestListener.java

  Log Message:
  -----------
  Merge branch 'master' into feature/prism-api

  Commit: da933aa84f63dc7a0fc5c6a29fb5cbbb612673c1
      https://github.com/Evolveum/midpoint/commit/da933aa84f63dc7a0fc5c6a29fb5cbbb612673c1
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2019-01-03 (Thu, 03 Jan 2019)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PropertyOrReferenceWrapper.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/ResourceObjectPattern.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/Item.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismContainer.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismValueUtil.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/delta/ItemDeltaCollectionsUtil.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/equivalence/EquivalenceStrategy.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/equivalence/ParameterizedEquivalenceStrategy.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/ItemImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContainerImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContainerValueImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismObjectImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismReferenceValueImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismValueImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/delta/ItemDeltaImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/delta/ObjectDeltaImpl.java
    M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java
    M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestCompare.java
    M infra/prism-impl/src/test/resources/common/json/user-jack.json
    A infra/prism-impl/src/test/resources/common/xml/ref-with-filter-different-path.xml
    A infra/prism-impl/src/test/resources/common/xml/ref-with-filter-no-oid.xml
    A infra/prism-impl/src/test/resources/common/xml/ref-with-filter.xml
    A infra/prism-impl/src/test/resources/common/xml/ref-without-filter.xml
    M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/ShadowIntegrityCheckResultHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/IvwoConsolidator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/ObjectTemplateProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/visualizer/Visualizer.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor.java
    M model/model-impl/src/test/resources/lens/user-barbossa-modify-delete-assignment-account-dummy-attr.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

  Log Message:
  -----------
  Merge branch 'feature/prism-api'

Compare: https://github.com/Evolveum/midpoint/compare/3bb3e858c426...da933aa84f63
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.