[midPoint-git] [Evolveum/midpoint] 36ae15: Add support for provenance metadata

[mederly]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 36ae15da4bfe935dfc0bb1b2dd1bf8e5ec3e900a
      https://github.com/Evolveum/midpoint/commit/36ae15da4bfe935dfc0bb1b2dd1bf8e5ec3e900a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-07-09 (Thu, 09 Jul 2020)

  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/PrismObject.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismValue.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/ValueMetadata.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/ObjectDelta.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/delta/PropertyDelta.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/PrismObjectImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismPropertyImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismPropertyValueImpl.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/main/java/com/evolveum/midpoint/prism/impl/delta/PropertyDeltaImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/item/DummyItem.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/metadata/ValueMetadataAdapter.java
    M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestDelta.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/metadata/MidpointValueMetadataFactory.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseDiffPatch.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/transformation/ValueTupleTransformation.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/AbstractMappingImpl.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingImpl.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/ValueMetadataComputation.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/ValueMetadataProcessingSpec.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/builtin/BaseBuiltinMetadataMapping.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/builtin/ProvenanceBuiltinMapping.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/ProjectionValuesProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/consolidation/DeltaSetTripleMapConsolidation.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestValueMetadata.java
    A model/model-intest/src/test/resources/metadata/provenance-metadata-recording/archetype-provenance-metadata-recording.xml
    A model/model-intest/src/test/resources/metadata/provenance-metadata-recording/origin-admin-entry.xml
    A model/model-intest/src/test/resources/metadata/provenance-metadata-recording/origin-hr-feed.xml
    A model/model-intest/src/test/resources/metadata/provenance-metadata-recording/origin-self-service-app.xml
    A model/model-intest/src/test/resources/metadata/provenance-metadata-recording/resource-hr.xml
    A model/model-intest/src/test/resources/metadata/provenance-metadata-recording/template-provenance-metadata-recording.xml
    A model/model-intest/src/test/resources/metadata/provenance-metadata-recording/user-leonhard.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectDeltaUpdater.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/TestResource.java

  Log Message:
  -----------
  Add support for provenance metadata

1) Built-in mapping for provenance (acquisition and yield) was
created. However, it is only a preliminary version. It cannot delete
values. This will require deeper changes in the framework.

2) Added support for metadata change on values KEPT during
consolidation. It is implemented as ADD & DELETE of the same value,
with different metadata. (Requires a lot of code changes.)

3) Prism equivalence/narrow methods were cleaned up a bit. This is
to enable correct diff'ing of values with metadata. This change has
a potential to break many things in midPoint.

4) Delta narrow method checks for ADD & DELETE of the same value.
Mainly to enable point 2 above.

5) Changed handling of deltas in the repository (to enable point 2).
This has broken various things and should be revisited.

6) Added consideringValueMetadata option in
ParameterizedEquivalenceStrategy.

7) Displaying basic value metadata in various debugDump/shortDump/etc
methods.

Related to MID-6275.


  Commit: 37e47dc797fece601603fd04aa202592e30ce9df
      https://github.com/Evolveum/midpoint/commit/37e47dc797fece601603fd04aa202592e30ce9df
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-07-09 (Thu, 09 Jul 2020)

  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/PrismObject.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.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/delta/PropertyDelta.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-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/PrismObjectImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismPropertyValueImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismReferenceImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/delta/ContainerDeltaImpl.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/main/java/com/evolveum/midpoint/prism/impl/delta/PropertyDeltaImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/item/DummyContainerImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/item/DummyItem.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/item/DummyPropertyImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/item/DummyReferenceImpl.java
    M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestCompare.java
    M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestDelta.java
    M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestEquals.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseDiffPatch.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.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/LensElementContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ProjectionValuesProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/visualizer/Visualizer.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/ProvisioningUtil.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectDeltaUpdater.java

  Log Message:
  -----------
  Improve item delta processing

In order to correctly record value metadata the delta processing
(and item modifications in general) were changed in this way:

1) Value is now added unless exactly the same (under "not literal"
strategy) value is present in the item. All equivalent values
(under configurable strategy) are removed before the addition.
This change is reflected also in delta application.

2) Delta narrowing functionality was clarified and (hopefully)
corrected to match these changes.

3) Various rarely used methods were removed from Item interface. They
were probably causing more harm than benefit, because of their unclear
semantics. Other minor clarifications of that interface.

4) Wrong initialization of ParameterizedEquivalenceStrategy
constants was fixed.

5) We removed some flexibility in equivalence strategy selection:
it's no longer possible to specify default strategy for items; nor
to execute deltas under custom strategies). Delta application
was switched from IGNORE_METADATA_CONSIDER_DIFFERENT_IDS to
REAL_VALUE_CONSIDER_DIFFERENT_IDS which is a bit weaker.

Related to MID-6275.


  Commit: b5937212fc40e69c96adb46b39572bca2905ef06
      https://github.com/Evolveum/midpoint/commit/b5937212fc40e69c96adb46b39572bca2905ef06
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-07-10 (Fri, 10 Jul 2020)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    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/user-adam-new-assignment-existing-id.xml
    A repo/repo-sql-impl-test/src/test/resources/modify/user-adam-new-assignment-no-id.xml
    A repo/repo-sql-impl-test/src/test/resources/modify/user-adam.xml
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectDeltaUpdater.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectUpdater.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/AssignmentExtensionUpdate.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/BaseUpdate.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/ExtensionUpdate.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/GeneralUpdate.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/MetadataUpdate.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/ObjectDeltaUpdater.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/ObjectExtensionUpdate.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/OperationResultUpdate.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/PhotoUpdate.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/TypeValuePair.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/UpdateContext.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/UpdateDispatcher.java

  Log Message:
  -----------
  Refactor ObjectDeltaUpdater before adapting it

Because of the change in ADD/REPLACE delta execution
we have to adapt the ObjectDeltaUpdater. This is a refactoring
(basically dividing it into a set of cooperating classes)
before the adaptation.

Related to MID-6275.


  Commit: e5dd3d4c58e78d2a43563c7da4e090286325d8bf
      https://github.com/Evolveum/midpoint/commit/e5dd3d4c58e78d2a43563c7da4e090286325d8bf
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-07-10 (Fri, 10 Jul 2020)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/GeneralUpdate.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/TypeValuePair.java

  Log Message:
  -----------
  Clean-up GeneralUpdate class before adapting it

This is a final cleanup step before adapting repo processing to
the change in ADD/REPLACE delta execution.

Related to MID-6275.


  Commit: a8e8880fdd142248d11e58eb81e4100ad85bcd3b
      https://github.com/Evolveum/midpoint/commit/a8e8880fdd142248d11e58eb81e4100ad85bcd3b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-07-10 (Fri, 10 Jul 2020)

  Changed paths:
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyTest.java
    R repo/repo-sql-impl-test/src/test/resources/modify/user-adam-new-assignment-existing-id.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/GeneralUpdate.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/ObjectDeltaUpdater.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/modify/DeltaUpdaterUtils.java

  Log Message:
  -----------
  Improve GeneralUpdate a bit

Minor changes in GeneralUpdate class e.g. swapping application
of add and delete values (now delete values come first, just like
in regular delta application). This is what has left from unsuccessful
attempt to make updater process container value metadata.

Related to MID-6275.


  Commit: 4a08872b170ed20f2dbadd697208248d0f74f1c5
      https://github.com/Evolveum/midpoint/commit/4a08872b170ed20f2dbadd697208248d0f74f1c5
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-07-10 (Fri, 10 Jul 2020)

  Changed paths:
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyTest.java
    A repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/StrangeModifyTest.java
    A repo/repo-sql-impl-test/src/test/resources/modify/user-bob.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignment.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/CollectionUpdate.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/GeneralUpdate.java

  Log Message:
  -----------
  Implement replacing container values in repo

We can now replace containers in repo (for the time being
if using client-specified ID). The session.merge call was the key.

This commit also:
- fixes equals/hashCode for RAssignment in cases when ownerOid is null
- factors out collection-updating functionality to CollectionUpdate
class.

Related to MID-6275.


  Commit: cc97743cfe9cabeffe74dff63b64ed5e9d525600
      https://github.com/Evolveum/midpoint/commit/cc97743cfe9cabeffe74dff63b64ed5e9d525600
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-07-11 (Sat, 11 Jul 2020)

  Changed paths:
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignment.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/ROperationExecution.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/CollectionUpdate.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/ContainerCollectionUpdate.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/GeneralUpdate.java

  Log Message:
  -----------
  Simplify [Container]CollectionUpdate

The code should be quite minimalistic now. It relies on repository
vs. XML consistency and tries to fail fast on any issues. Highly
experimental - we will see how it will behave in production.

Related to MID-6275.


  Commit: a68b58859e69cfd7e07dcee5091054aefb43a1ed
      https://github.com/Evolveum/midpoint/commit/a68b58859e69cfd7e07dcee5091054aefb43a1ed
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-07-11 (Sat, 11 Jul 2020)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    M repo/repo-sql-impl-test/src/test/resources/modify/user-adam.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAccessCertificationCase.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RCaseWorkItem.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/ROperationExecution.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RTrigger.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RLookupTableRow.java

  Log Message:
  -----------
  Fix getting/setting ownerOid on containers in repo

Also adapted tests that check for audit and notification
outputs for redundant primary ADD deltas. See MID-6370.

Related to MID-6275.


  Commit: 3c5403e34c8bb08fc65560e9e188f1add961065c
      https://github.com/Evolveum/midpoint/commit/3c5403e34c8bb08fc65560e9e188f1add961065c
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-07-11 (Sat, 11 Jul 2020)

  Changed paths:
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/other/TestMiscellaneous.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java

  Log Message:
  -----------
  Adapt a workflow test to recent repo changes

Actually, the current behavior is more correct than before.
The test was wrong.

Related to MID-6275.


  Commit: 7eff1b1986e2164c3dea5a771d4eb29167a6730f
      https://github.com/Evolveum/midpoint/commit/7eff1b1986e2164c3dea5a771d4eb29167a6730f
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-07-11 (Sat, 11 Jul 2020)

  Changed paths:
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/metadata/ValueMetadataAdapter.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/ValueMetadataProcessingSpec.java

  Log Message:
  -----------
  Fix metadata shortDump output


  Commit: 818e69267a52dd8edeb9182f83ce5b0682642445
      https://github.com/Evolveum/midpoint/commit/818e69267a52dd8edeb9182f83ce5b0682642445
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-07-11 (Sat, 11 Jul 2020)

  Changed paths:
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/gui/TestIntegrationObjectWrapperFactory.java
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/gui/TestWrapperDelta.java

  Log Message:
  -----------
  Temporarily disable 3 failing GUI tests


  Commit: 8a35832565619e120aeacc37d93a09af79a3e669
      https://github.com/Evolveum/midpoint/commit/8a35832565619e120aeacc37d93a09af79a3e669
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-07-13 (Mon, 13 Jul 2020)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinition.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/InboundProcessor.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectReferenceResolver.java
    M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ConnectorInstance.java

  Log Message:
  -----------
  Do minor cleanup before provenance for inbounds

Also, un-deprecated isIgnored(LayerType layer) in RAD.

Related to MID-6275.


  Commit: 7c77640b57a1fab114ccac7fd0bc4db043847be5
      https://github.com/Evolveum/midpoint/commit/7c77640b57a1fab114ccac7fd0bc4db043847be5
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-07-13 (Mon, 13 Jul 2020)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/ReferenceAutocomplete.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/ReferenceValueSearchPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchItemPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SwitchablePropertyValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/filter/ValueSearchFilterItem.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/RunReportPopupPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditEventRecordProvider.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
    M infra/schema/src/test/resources/object-template/object-template.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/controller/AuditController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ClockworkAuditHelper.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/PasswordAuthenticationEvaluatorImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AuditHelper.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/security/TestAbstractAuthenticationEvaluator.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestAudit.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestRecomputeTask.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestUuid.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportUtils.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/controller/export/ExportController.java
    M pom.xml
    M repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditEventRecord.java
    M repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditEventStage.java
    M repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditEventType.java
    M repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditService.java
    M repo/audit-impl/pom.xml
    M repo/audit-impl/src/main/java/com/evolveum/midpoint/audit/impl/LoggerAuditServiceImpl.java
    M repo/repo-sql-impl-test/pom.xml
    A repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/AuditSearchTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/AuditTest.java
    M repo/repo-sql-impl-test/testng-integration.xml
    M repo/repo-sql-impl/pom.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/ConflictWatcherImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/DataSourceFactory.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceFactory.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryConfiguration.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryFactory.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/InsertQueryBuilder.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/SelectQueryBuilder.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/SingleSqlQuery.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/SqlQuery.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RAuditEventRecord.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RAuditEventStage.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RAuditEventType.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyConverter.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAssignmentExtension.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RItemKind.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignment.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RCaseWorkItemReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RCertWorkItemReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RContainerReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RTrigger.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/embedded/RActivation.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/embedded/RAutoassignSpecification.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/embedded/REmbeddedNamedReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/embedded/REmbeddedReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/embedded/ROperationalState.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/embedded/RPolyString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/enums/ROperationResultStatus.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RObjectType.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RReferenceType.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/factory/MetadataFactory.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/BaseHelper.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/LookupTableHelper.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectDeltaUpdater.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectUpdater.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/OrgClosureManager.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/mapper/EnumMapper.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/AuditEventRecordSqlTransformer.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/FilterProcessor.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/FlexibleRelationalPathBase.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/NaryLogicalFilterProcessor.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/NotFilterProcessor.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/ObjectFilterProcessor.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/PageOf.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/PropertyValueFilterProcessor.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/RefFilterProcessor.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/SqlGeneration.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/SqlPathContext.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/SqlQueryContext.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/SqlQueryExecutor.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/SqlTransformer.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/mapping/EnumOrdinalItemFilterProcessor.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/mapping/ItemFilterProcessor.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/mapping/ItemSqlMapper.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/mapping/QAuditEventRecordMapping.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/mapping/QueryModelMapping.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/mapping/QueryModelMappingConfig.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/mapping/QueryModelMappingRegistry.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/mapping/RefItemFilterProcessor.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/mapping/SqlDetailFetchMapper.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/mapping/StringItemFilterProcessor.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/mapping/TimestampItemFilterProcessor.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/querymodel/QAuditDelta.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/querymodel/QAuditEventRecord.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/querymodel/QAuditItem.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/querymodel/QAuditPropertyValue.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/querymodel/QAuditRefValue.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/querymodel/QAuditResource.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/querymodel/beans/MAuditDelta.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/querymodel/beans/MAuditEventRecord.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/querymodel/beans/MAuditPropertyValue.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/querymodel/support/InstantType.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/InterpretationContext.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryDefinitionRegistry.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryInterpreter.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/RQueryImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/definition/ClassDefinitionParser.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/definition/JpaAnyItemLinkDefinition.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/definition/JpaReferenceDefinition.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/definition/VirtualAnyContainerDefinition.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/hqm/EntityReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/hqm/HibernateQuery.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/hqm/JoinSpecification.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/hqm/RootHibernateQuery.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/hqm/condition/Condition.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/hqm/condition/ExistsCondition.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/hqm/condition/InCondition.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/hqm/condition/NotCondition.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/hqm/condition/PropertyCondition.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/hqm/condition/PropertyPropertyComparisonCondition.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/hqm/condition/SimpleComparisonCondition.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/matcher/Matcher.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/matcher/PolyStringMatcher.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/matcher/StringMatcher.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/resolution/ItemPathResolutionState.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/resolution/ItemPathResolver.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/ItemRestriction.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/PropertyRestriction.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/Restriction.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ClassMapper.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ContainerOidGenerator.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/MidPointImplicitNamingStrategy.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/MidpointPersisterUtil.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ObjectOidGenerator.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ScrollableResultsIterator.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/TemporaryTableDialect.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyAuditService.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/AuditServiceProxy.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/test/NullTaskImpl.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M11SystemConfiguration.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/Search.java

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


  Commit: baa4e6c8bcc3d48d7280120eae973ce7372afcda
      https://github.com/Evolveum/midpoint/commit/baa4e6c8bcc3d48d7280120eae973ce7372afcda
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-07-13 (Mon, 13 Jul 2020)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/ReferenceAutocomplete.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/ReferenceValueSearchPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchItemPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SwitchablePropertyValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/filter/ValueSearchFilterItem.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/RunReportPopupPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditEventRecordProvider.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
    M infra/schema/src/test/resources/object-template/object-template.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/controller/AuditController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ClockworkAuditHelper.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/PasswordAuthenticationEvaluatorImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AuditHelper.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/security/TestAbstractAuthenticationEvaluator.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestAudit.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestRecomputeTask.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestUuid.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportUtils.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/controller/export/ExportController.java
    M pom.xml
    M repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditEventRecord.java
    M repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditEventStage.java
    M repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditEventType.java
    M repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditService.java
    M repo/audit-impl/pom.xml
    M repo/audit-impl/src/main/java/com/evolveum/midpoint/audit/impl/LoggerAuditServiceImpl.java
    M repo/repo-sql-impl-test/pom.xml
    A repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/AuditSearchTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/AuditTest.java
    M repo/repo-sql-impl-test/testng-integration.xml
    M repo/repo-sql-impl/pom.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/ConflictWatcherImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/DataSourceFactory.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceFactory.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryConfiguration.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryFactory.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/InsertQueryBuilder.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/SelectQueryBuilder.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/SingleSqlQuery.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/SqlQuery.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RAuditEventRecord.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RAuditEventStage.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RAuditEventType.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyConverter.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAssignmentExtension.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RItemKind.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignment.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RCaseWorkItemReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RCertWorkItemReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RContainerReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RTrigger.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/embedded/RActivation.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/embedded/RAutoassignSpecification.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/embedded/REmbeddedNamedReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/embedded/REmbeddedReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/embedded/ROperationalState.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/embedded/RPolyString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/enums/ROperationResultStatus.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RObjectType.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RReferenceType.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/factory/MetadataFactory.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/BaseHelper.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/LookupTableHelper.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectDeltaUpdater.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectUpdater.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/OrgClosureManager.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/mapper/EnumMapper.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/AuditEventRecordSqlTransformer.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/FilterProcessor.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/FlexibleRelationalPathBase.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/NaryLogicalFilterProcessor.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/NotFilterProcessor.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/ObjectFilterProcessor.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/PageOf.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/PropertyValueFilterProcessor.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/RefFilterProcessor.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/SqlGeneration.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/SqlPathContext.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/SqlQueryContext.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/SqlQueryExecutor.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/SqlTransformer.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/mapping/EnumOrdinalItemFilterProcessor.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/mapping/ItemFilterProcessor.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/mapping/ItemSqlMapper.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/mapping/QAuditEventRecordMapping.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/mapping/QueryModelMapping.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/mapping/QueryModelMappingConfig.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/mapping/QueryModelMappingRegistry.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/mapping/RefItemFilterProcessor.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/mapping/SqlDetailFetchMapper.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/mapping/StringItemFilterProcessor.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/mapping/TimestampItemFilterProcessor.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/querymodel/QAuditDelta.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/querymodel/QAuditEventRecord.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/querymodel/QAuditItem.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/querymodel/QAuditPropertyValue.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/querymodel/QAuditRefValue.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/querymodel/QAuditResource.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/querymodel/beans/MAuditDelta.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/querymodel/beans/MAuditEventRecord.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/querymodel/beans/MAuditPropertyValue.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/querymodel/support/InstantType.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/InterpretationContext.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryDefinitionRegistry.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryInterpreter.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/RQueryImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/definition/ClassDefinitionParser.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/definition/JpaAnyItemLinkDefinition.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/definition/JpaReferenceDefinition.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/definition/VirtualAnyContainerDefinition.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/hqm/EntityReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/hqm/HibernateQuery.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/hqm/JoinSpecification.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/hqm/RootHibernateQuery.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/hqm/condition/Condition.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/hqm/condition/ExistsCondition.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/hqm/condition/InCondition.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/hqm/condition/NotCondition.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/hqm/condition/PropertyCondition.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/hqm/condition/PropertyPropertyComparisonCondition.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/hqm/condition/SimpleComparisonCondition.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/matcher/Matcher.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/matcher/PolyStringMatcher.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/matcher/StringMatcher.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/resolution/ItemPathResolutionState.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/resolution/ItemPathResolver.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/ItemRestriction.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/PropertyRestriction.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/Restriction.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ClassMapper.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ContainerOidGenerator.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/MidPointImplicitNamingStrategy.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/MidpointPersisterUtil.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ObjectOidGenerator.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ScrollableResultsIterator.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/TemporaryTableDialect.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyAuditService.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/AuditServiceProxy.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/test/NullTaskImpl.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M11SystemConfiguration.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/Search.java

  Log Message:
  -----------
  Merge branch 'master' into tmp/provenance

# Conflicts:
#	infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
#	repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectDeltaUpdater.java
#	repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectUpdater.java


  Commit: f6a9f8930fcae24ac506dae62f369a64de6eff4b
      https://github.com/Evolveum/midpoint/commit/f6a9f8930fcae24ac506dae62f369a64de6eff4b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-07-13 (Mon, 13 Jul 2020)

  Changed paths:
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectDeltaUpdater.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/ObjectDeltaUpdater.java

  Log Message:
  -----------
  Fix merge conflicts


Compare: https://github.com/Evolveum/midpoint/compare/c45537f9bc63...f6a9f8930fca